- sr-dev - kamailio.org

git:master:b32a9caf: core: parse uri - extra check when user part is missing before @
by Daniel-Constantin Mierla 16 Mar '22

16 Mar '22

Module: kamailio Branch: master Commit: b32a9caf4797370a4704b5f94d2d704b6e52fdef URL: https://github.com/kamailio/kamailio/commit/b32a9caf4797370a4704b5f94d2d704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-16T10:11:43+01:00 core: parse uri - extra check when user part is missing before @ --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/b32a9caf4797370a4704b5f94d2d704… Patch: https://github.com/kamailio/kamailio/commit/b32a9caf4797370a4704b5f94d2d704… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index edc46acea1..adc94fbc0a 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1241,14 +1241,15 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) /* port value too large */ goto error_invalid_port; } - if(uri->host.len>0 && uri->host.s>buf && *(uri->host.s-1)=='@' - && uri->user.len<=0) { + if(uri->host.len>0 && uri->user.len<=0 &&uri->host.s>buf && (*(uri->host.s-1)=='@' + || *uri->host.s=='@')) { /* '@' before host, but no user part */ goto error_bad_uri; } #ifdef EXTRA_DEBUG /* do stuff */ + LM_DBG("state=%d\n", state); LM_DBG("parsed uri:\n type=%d user=<%.*s>(%d)\n passwd=<%.*s>(%d)\n" " host=<%.*s>(%d)\n port=<%.*s>(%d): %d\n params=<%.*s>(%d)\n" " headers=<%.*s>(%d)\n",

1 0

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: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: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: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

git:master:67e0fa5e: core: parser digest - warn if the header type is not set properly
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 67e0fa5e53ef5d4dd9802e3027b2bc7ff6dcb671 URL: https://github.com/kamailio/kamailio/commit/67e0fa5e53ef5d4dd9802e3027b2bc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:30:58+01:00 core: parser digest - warn if the header type is not set properly --- Modified: src/core/parser/digest/digest.c --- Diff: https://github.com/kamailio/kamailio/commit/67e0fa5e53ef5d4dd9802e3027b2bc7… Patch: https://github.com/kamailio/kamailio/commit/67e0fa5e53ef5d4dd9802e3027b2bc7… --- diff --git a/src/core/parser/digest/digest.c b/src/core/parser/digest/digest.c index ccc62a6551..83cce621f0 100644 --- a/src/core/parser/digest/digest.c +++ b/src/core/parser/digest/digest.c @@ -259,8 +259,9 @@ int find_credentials(struct sip_msg* msg, str* realm, hdr_flags=HDR_PROXYAUTH_F; break; default: + LM_WARN("unexpected header type %d - using authorization\n", hftype); hook = &(msg->authorization); - hdr_flags=HDR_T2F(hftype); + hdr_flags=HDR_AUTHORIZATION_F; break; }

1 0

git:master:f9a38d6b: core: parser - catch special header types for get_hdr()
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: f9a38d6b621a2c3966a3c85dce6fdd2e6bb8d431 URL: https://github.com/kamailio/kamailio/commit/f9a38d6b621a2c3966a3c85dce6fdd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:35:12+01:00 core: parser - catch special header types for get_hdr() --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/f9a38d6b621a2c3966a3c85dce6fdd2… Patch: https://github.com/kamailio/kamailio/commit/f9a38d6b621a2c3966a3c85dce6fdd2… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index a348503544..6455c9e539 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1012,10 +1012,14 @@ hdr_field_t* get_hdr(const sip_msg_t* const msg, const enum _hdr_types_t ht) { hdr_field_t *hdr; - if (msg->parsed_flag & HDR_T2F(ht)) + if (ht == HDR_ERROR_T || ht == HDR_EOH_T) { + return NULL; + } + if (msg->parsed_flag & HDR_T2F(ht)) { for(hdr = msg->headers; hdr; hdr = hdr->next) { if(hdr->type == ht) return hdr; } + } return NULL; }

1 0

git:master:5c774d6e: ims_auth: warn if the header type is not set properly
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 5c774d6eced2ad52cb341b9e36419aac6c0506cb URL: https://github.com/kamailio/kamailio/commit/5c774d6eced2ad52cb341b9e36419aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:38:42+01:00 ims_auth: warn if the header type is not set properly --- Modified: src/modules/ims_auth/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/5c774d6eced2ad52cb341b9e36419aa… Patch: https://github.com/kamailio/kamailio/commit/5c774d6eced2ad52cb341b9e36419aa… --- diff --git a/src/modules/ims_auth/utils.c b/src/modules/ims_auth/utils.c index 94d02e3fe7..b745af0275 100644 --- a/src/modules/ims_auth/utils.c +++ b/src/modules/ims_auth/utils.c @@ -71,8 +71,9 @@ int ims_find_credentials(struct sip_msg* _m, str* _realm, hdr_flags = HDR_PROXYAUTH_F; break; default: + LM_WARN("unexpected header type %d - using authorization\n", _hftype); hook = &(_m->authorization); - hdr_flags = HDR_T2F(_hftype); + hdr_flags = HDR_AUTHORIZATION_F; break; }

1 0

git:master:8b20e604: core: parse - fix typo in comment of previous commit
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 8b20e6045dbebdb784a4e8f66d81fc79c0a17304 URL: https://github.com/kamailio/kamailio/commit/8b20e6045dbebdb784a4e8f66d81fc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:18:23+01:00 core: parse - fix typo in comment of previous commit --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/8b20e6045dbebdb784a4e8f66d81fc7… Patch: https://github.com/kamailio/kamailio/commit/8b20e6045dbebdb784a4e8f66d81fc7… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 8f7a53f77b..edc46acea1 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1238,7 +1238,7 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) /* common sanity checks */ if(uri->port.len>5) { - /* port value to large */ + /* port value too large */ goto error_invalid_port; } if(uri->host.len>0 && uri->host.s>buf && *(uri->host.s-1)=='@'

1 0

git:master:eda4b3c5: core: parse uri - sanity check for user part
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: eda4b3c51ce12d4fe052b7e9ad40be1ef6e56444 URL: https://github.com/kamailio/kamailio/commit/eda4b3c51ce12d4fe052b7e9ad40be1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:11:09+01:00 core: parse uri - sanity check for user part --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/eda4b3c51ce12d4fe052b7e9ad40be1… Patch: https://github.com/kamailio/kamailio/commit/eda4b3c51ce12d4fe052b7e9ad40be1… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 6cbf22a7c7..8f7a53f77b 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -1236,8 +1236,16 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) break; /* do nothing, avoids a compilation warning */ } - if(uri->port.len>5) + /* common sanity checks */ + if(uri->port.len>5) { + /* port value to large */ goto error_invalid_port; + } + if(uri->host.len>0 && uri->host.s>buf && *(uri->host.s-1)=='@' + && uri->user.len<=0) { + /* '@' before host, but no user part */ + goto error_bad_uri; + } #ifdef EXTRA_DEBUG /* do stuff */

1 0

git:master:692d15ce: pua_reginfo: init uri buffer
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 692d15ce9bcc329fff55060dcdc8e5161f12c30e URL: https://github.com/kamailio/kamailio/commit/692d15ce9bcc329fff55060dcdc8e51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:00:41+01:00 pua_reginfo: init uri buffer --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/692d15ce9bcc329fff55060dcdc8e51… Patch: https://github.com/kamailio/kamailio/commit/692d15ce9bcc329fff55060dcdc8e51… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index ee533a6a63..07fceba899 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -239,6 +239,7 @@ int process_body(str notify_body, udomain_t * domain) { /* Temporary */ int mem_only = 1; + uri[0] = '\0'; doc = xmlParseMemory(notify_body.s, notify_body.len); if(doc== NULL) { LM_ERR("Error while parsing the xml body message, Body is:\n%.*s\n",

1 0

git:master:0204232b: dmq: init peer structures
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 0204232ba1f229edb9c7e0080e98e9d3b2500672 URL: https://github.com/kamailio/kamailio/commit/0204232ba1f229edb9c7e0080e98e9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:00:41+01:00 dmq: init peer structures --- Modified: src/modules/dmq/dmq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/0204232ba1f229edb9c7e0080e98e9d… Patch: https://github.com/kamailio/kamailio/commit/0204232ba1f229edb9c7e0080e98e9d… --- diff --git a/src/modules/dmq/dmq_funcs.c b/src/modules/dmq/dmq_funcs.c index aeea4a83e3..a71e0a85a3 100644 --- a/src/modules/dmq/dmq_funcs.c +++ b/src/modules/dmq/dmq_funcs.c @@ -300,8 +300,8 @@ int ki_dmq_send_message(sip_msg_t *msg, str *peer_str, str *to_str, dmq_peer_t *destination_peer = find_peer(*peer_str); if(!destination_peer) { + dmq_peer_t new_peer = {0}; LM_INFO("cannot find peer %.*s\n", peer_str->len, peer_str->s); - dmq_peer_t new_peer; new_peer.callback = empty_peer_callback; new_peer.description.s = ""; new_peer.description.len = 0; @@ -370,9 +370,9 @@ int ki_dmq_bcast_message(sip_msg_t *msg, str *peer_str, str *body_str, dmq_peer_t *destination_peer = find_peer(*peer_str); if(!destination_peer) { + dmq_peer_t new_peer = {0}; LM_INFO("cannot find peer %.*s - adding it.\n", peer_str->len, peer_str->s); - dmq_peer_t new_peer; new_peer.callback = empty_peer_callback; new_peer.description.s = ""; new_peer.description.len = 0;

1 0

git:master:0b684a5d: sipcapture: more init buffers content
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 0b684a5d9a2f5d17e64cb8cb5f4b53b06f180f06 URL: https://github.com/kamailio/kamailio/commit/0b684a5d9a2f5d17e64cb8cb5f4b53b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:00:41+01:00 sipcapture: more init buffers content --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/0b684a5d9a2f5d17e64cb8cb5f4b53b… Patch: https://github.com/kamailio/kamailio/commit/0b684a5d9a2f5d17e64cb8cb5f4b53b… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 4c032ab239..6ec37ffbd7 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2569,6 +2569,8 @@ int receive_logging_json_msg(char *buf, unsigned int len, str corrtmp = STR_NULL; _capture_mode_data_t *c = NULL; + ipstr_dst[0] = '\0'; + ipstr_src[0] = '\0'; c = capture_def; if(!c) { LM_ERR("no connection mode available to store data\n");

1 0

git:master:9292b9f5: sipcapture: init buffers content
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 9292b9f5daacfa5340b5fe1a5f02469a7e597d9b URL: https://github.com/kamailio/kamailio/commit/9292b9f5daacfa5340b5fe1a5f02469… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T10:00:41+01:00 sipcapture: init buffers content --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/9292b9f5daacfa5340b5fe1a5f02469… Patch: https://github.com/kamailio/kamailio/commit/9292b9f5daacfa5340b5fe1a5f02469… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 9070e1e9fc..4c032ab239 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2580,6 +2580,8 @@ int receive_logging_json_msg(char *buf, unsigned int len, return -1; } + ipstr_dst[0] = '\0'; + ipstr_src[0] = '\0'; memset(&sco, 0, sizeof(struct _sipcapture_object)); gettimeofday(&tvb, &tz);

1 0

git:5.5:19e3d173: pv-headers: ignore skip-header config on clone_branch
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.5 Commit: 19e3d173ab0bc30663c67874708c95469699d82a URL: https://github.com/kamailio/kamailio/commit/19e3d173ab0bc30663c67874708c954… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:56:46+01:00 pv-headers: ignore skip-header config on clone_branch (cherry picked from commit 473e051bef688d9e78bc4c28abebbedfffd1f549) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/19e3d173ab0bc30663c67874708c954… Patch: https://github.com/kamailio/kamailio/commit/19e3d173ab0bc30663c67874708c954… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index b8e4f92e61..8b2acbf08b 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -515,8 +515,6 @@ int pvh_clone_branch_xavi(struct sip_msg *msg, str *xname) } do { - if(pvh_skip_header(&sub->name)) - continue; if(sub->val.type == SR_XTYPE_DATA) continue; if(pvh_xavi_append_value(&sub->name, &sub->val, &br_xavi->val.v.xavp)

1 0

git:master:473e051b: pv-headers: ignore skip-header config on clone_branch
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 473e051bef688d9e78bc4c28abebbedfffd1f549 URL: https://github.com/kamailio/kamailio/commit/473e051bef688d9e78bc4c28abebbed… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:54:47+01:00 pv-headers: ignore skip-header config on clone_branch --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/473e051bef688d9e78bc4c28abebbed… Patch: https://github.com/kamailio/kamailio/commit/473e051bef688d9e78bc4c28abebbed… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index b8e4f92e61..8b2acbf08b 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -515,8 +515,6 @@ int pvh_clone_branch_xavi(struct sip_msg *msg, str *xname) } do { - if(pvh_skip_header(&sub->name)) - continue; if(sub->val.type == SR_XTYPE_DATA) continue; if(pvh_xavi_append_value(&sub->name, &sub->val, &br_xavi->val.v.xavp)

1 0

git:5.3:f35c7fe0: db_redis: clean previous connection before trying to reconnect
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.3 Commit: f35c7fe0016fea44bbfa4d686f985cf5db4a3372 URL: https://github.com/kamailio/kamailio/commit/f35c7fe0016fea44bbfa4d686f985cf… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:50:54+01:00 db_redis: clean previous connection before trying to reconnect (cherry picked from commit 78c8d084e30373aacc456fd41062b68e6e82ea6f) (cherry picked from commit 2e0537ba306219df0ce71605848e811027c69a57) (cherry picked from commit 78506f7f2dfcdbf2bc9e21168929437516a368bd) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/f35c7fe0016fea44bbfa4d686f985cf… Patch: https://github.com/kamailio/kamailio/commit/f35c7fe0016fea44bbfa4d686f985cf… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 5a5887d658..bb7423fcbd 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -111,6 +111,11 @@ int db_redis_connect(km_redis_con_t *con) { db = atoi(con->id->database); reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

1 0

git:5.4:78506f7f: db_redis: clean previous connection before trying to reconnect
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.4 Commit: 78506f7f2dfcdbf2bc9e21168929437516a368bd URL: https://github.com/kamailio/kamailio/commit/78506f7f2dfcdbf2bc9e21168929437… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:50:01+01:00 db_redis: clean previous connection before trying to reconnect (cherry picked from commit 78c8d084e30373aacc456fd41062b68e6e82ea6f) (cherry picked from commit 2e0537ba306219df0ce71605848e811027c69a57) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/78506f7f2dfcdbf2bc9e21168929437… Patch: https://github.com/kamailio/kamailio/commit/78506f7f2dfcdbf2bc9e21168929437… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index dd421a7844..d6c24163b1 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -112,6 +112,11 @@ int db_redis_connect(km_redis_con_t *con) { db = atoi(con->id->database); reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

1 0

git:5.5:2e0537ba: db_redis: clean previous connection before trying to reconnect
by Victor Seva 15 Mar '22

15 Mar '22

Module: kamailio Branch: 5.5 Commit: 2e0537ba306219df0ce71605848e811027c69a57 URL: https://github.com/kamailio/kamailio/commit/2e0537ba306219df0ce71605848e811… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-15T08:49:14+01:00 db_redis: clean previous connection before trying to reconnect (cherry picked from commit 78c8d084e30373aacc456fd41062b68e6e82ea6f) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/2e0537ba306219df0ce71605848e811… Patch: https://github.com/kamailio/kamailio/commit/2e0537ba306219df0ce71605848e811… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index dd421a7844..d6c24163b1 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -112,6 +112,11 @@ int db_redis_connect(km_redis_con_t *con) { db = atoi(con->id->database); reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

1 0

git:master:0c101ffe: core: parse uri - detect empty user when @ is found
by Daniel-Constantin Mierla 15 Mar '22

15 Mar '22

Module: kamailio Branch: master Commit: 0c101ffe713603e812759da6d396e0451cf13ba1 URL: https://github.com/kamailio/kamailio/commit/0c101ffe713603e812759da6d396e04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-15T08:18:03+01:00 core: parse uri - detect empty user when @ is found --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/0c101ffe713603e812759da6d396e04… Patch: https://github.com/kamailio/kamailio/commit/0c101ffe713603e812759da6d396e04… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index 19f6f2e02a..6cbf22a7c7 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -434,6 +434,10 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) /* found the user*/ uri->user.s=s; uri->user.len=p-s; + if(uri->user.len<=0) { + /* at '@' and no user part */ + goto error_bad_char; + } state=URI_HOST; found_user=1; s=p+1; /* skip '@' */

1 0

[kamailio/kamailio] Error when running kamdbctl create (Issue #3055)
by lcph 15 Mar '22

15 Mar '22

When running kamdbctl create, it fails. The error is as show below. Can someone with knowledge please help me solve this. /usr/share/kamailio/mysql$ kamdbctl create MySQL password for root: -e database engine 'mysql' loaded -e \E[37;33mINFO: test server charset mysql: [Warning] Using a password on the command line interface can be insecure. ERROR 1682 (HY000) at line 1: Native table 'performance_schema'.'session_variables' has the wrong structure mysql: [Warning] Using a password on the command line interface can be insecure. Usage: grep [OPTION]... PATTERN [FILE]... Try 'grep --help' for more information. /usr/sbin/kamdbctl: 117: [: =: unexpected operator -e \E[37;33mINFO: creating database kamailio ... mysql: [Warning] Using a password on the command line interface can be insecure. ERROR 1064 (42000) at line 1: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1 -e \E[37;31mERROR: Creatin -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3055 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3055(a)github.com>

2 2

[kamailio/kamailio] Dispatcher ds_reload() function always returns error (Issue #3054)
by kdanderso 14 Mar '22

14 Mar '22

### Description The ds_reload() function in dispatcher.c always returns -1, even when successful. ### Possible Solutions I think a patch like the following would resolve the issue. ``` diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 059df89123..83d6b45ee9 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -963,13 +963,15 @@ static int ds_reload(sip_msg_t *msg) *ds_rpc_reload_time = time(NULL); if(!ds_db_url.s) { - if(ds_load_list(dslistfile) != 0) + if(ds_load_list(dslistfile) != 0) { LM_ERR("Error reloading from list\n"); - return -1; + return -1; + } } else { - if(ds_reload_db() < 0) + if(ds_reload_db() < 0) { LM_ERR("Error reloading from db\n"); - return -1; + return -1; + } } LM_DBG("reloaded dispatcher\n"); return 1; ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.5.3 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3054 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3054(a)github.com>

2 2

git:master:30079910: dispatcher: fix ds_reload() return logic
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 30079910bbb33b430621f188beae40c71592bcba URL: https://github.com/kamailio/kamailio/commit/30079910bbb33b430621f188beae40c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T17:07:42+01:00 dispatcher: fix ds_reload() return logic - GH #3054 --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/30079910bbb33b430621f188beae40c… Patch: https://github.com/kamailio/kamailio/commit/30079910bbb33b430621f188beae40c… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 059df89123..83d6b45ee9 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -963,13 +963,15 @@ static int ds_reload(sip_msg_t *msg) *ds_rpc_reload_time = time(NULL); if(!ds_db_url.s) { - if(ds_load_list(dslistfile) != 0) + if(ds_load_list(dslistfile) != 0) { LM_ERR("Error reloading from list\n"); - return -1; + return -1; + } } else { - if(ds_reload_db() < 0) + if(ds_reload_db() < 0) { LM_ERR("Error reloading from db\n"); - return -1; + return -1; + } } LM_DBG("reloaded dispatcher\n"); return 1;

1 0

git:master:4659d27f: core: mem - define qm_report() for compilation with debug disabled
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 4659d27f73f4e4d840e04a20d9b65a76280954e8 URL: https://github.com/kamailio/kamailio/commit/4659d27f73f4e4d840e04a20d9b65a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T13:01:24+01:00 core: mem - define qm_report() for compilation with debug disabled --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/4659d27f73f4e4d840e04a20d9b65a7… Patch: https://github.com/kamailio/kamailio/commit/4659d27f73f4e4d840e04a20d9b65a7… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 2ff295fcb1..ba64f00854 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -1145,6 +1145,14 @@ void qm_mod_free_stats(void *qm_rootp) void qm_sums(void *qmp) { + LM_WARN("Enable DBG_QM_MALLOC for getting the status summary\n"); + return; +} + +void qm_report(void* qmp, mem_report_t *mrep) +{ + LM_WARN("Enable DBG_QM_MALLOC for getting the report\n"); + memset(mrep, 0, sizeof(mem_report_t)); return; }

1 0

git:master:9140686d: misctesc: sync-ed with fuzz function
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 9140686dcd4c32712e46f3e6e824ab090545a03e URL: https://github.com/kamailio/kamailio/commit/9140686dcd4c32712e46f3e6e824ab0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:53:56+01:00 misctesc: sync-ed with fuzz function --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9140686dcd4c32712e46f3e6e824ab0… Patch: https://github.com/kamailio/kamailio/commit/9140686dcd4c32712e46f3e6e824ab0… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index 0867c1ae46..c00a8b9c5c 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -40,6 +40,7 @@ #include "../../core/parser/parse_hname2.h" #include "../../core/parser/contact/parse_contact.h" #include "../../core/parser/parse_to.h" +#include "../../core/parser/parse_rr.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_refer_to.h" #include "../../core/parser/parse_ppi_pai.h" @@ -341,7 +342,7 @@ static int misctest_message_init(void) parse_to_uri(&tmsg); - parse_contact_header(&tmsg); + parse_contact_headers(&tmsg); parse_refer_to_header(&tmsg); @@ -355,6 +356,10 @@ static int misctest_message_init(void) parse_identityinfo_header(&tmsg); + parse_record_route_headers(&tmsg); + + parse_route_headers(&tmsg); + str uri; get_src_uri(&tmsg, 0, &uri);

1 0

git:master:ae46c85a: core: fuzz - include missing headers file for last changes
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: ae46c85a3d1e829900080c2b6ee16fda1bce90d4 URL: https://github.com/kamailio/kamailio/commit/ae46c85a3d1e829900080c2b6ee16fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:28:55+01:00 core: fuzz - include missing headers file for last changes --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/ae46c85a3d1e829900080c2b6ee16fd… Patch: https://github.com/kamailio/kamailio/commit/ae46c85a3d1e829900080c2b6ee16fd… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index 6688e92389..e20c2e64f3 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -4,6 +4,7 @@ #include "../parser/contact/parse_contact.h" #include "../parser/parse_from.h" #include "../parser/parse_to.h" +#include "../parser/parse_rr.h" #include "../parser/parse_refer_to.h" #include "../parser/parse_ppi_pai.h" #include "../parser/parse_privacy.h"

1 0

git:master:a9e92eb9: misc: fuzz - add functions for parsing record-/route headers
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: a9e92eb9dfe4e52b45e271bcfa51c0c732dc23c4 URL: https://github.com/kamailio/kamailio/commit/a9e92eb9dfe4e52b45e271bcfa51c0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:20:37+01:00 misc: fuzz - add functions for parsing record-/route headers --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/a9e92eb9dfe4e52b45e271bcfa51c0c… Patch: https://github.com/kamailio/kamailio/commit/a9e92eb9dfe4e52b45e271bcfa51c0c… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index d832ff3d92..6688e92389 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -52,6 +52,10 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { parse_identityinfo_header(&orig_inv); + parse_record_route_headers(&orig_inv); + + parse_route_headers(&orig_inv); + str uri; get_src_uri(&orig_inv, 0, &uri);

1 0

git:master:22b8ecc2: core: parser - helper functions to parse all record-/route headers
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 22b8ecc24442dce775600dfb186a83bc947fd4ca URL: https://github.com/kamailio/kamailio/commit/22b8ecc24442dce775600dfb186a83b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T12:17:42+01:00 core: parser - helper functions to parse all record-/route headers --- Modified: src/core/parser/parse_rr.c Modified: src/core/parser/parse_rr.h --- Diff: https://github.com/kamailio/kamailio/commit/22b8ecc24442dce775600dfb186a83b… Patch: https://github.com/kamailio/kamailio/commit/22b8ecc24442dce775600dfb186a83b… --- diff --git a/src/core/parser/parse_rr.c b/src/core/parser/parse_rr.c index 9557bffc9b..e8854cbd4b 100644 --- a/src/core/parser/parse_rr.c +++ b/src/core/parser/parse_rr.c @@ -494,3 +494,49 @@ int get_path_dst_uri(str *_p, str *_dst) return 0; } + +/*! + * Parse all Record-Route header + */ +int parse_record_route_headers(sip_msg_t *msg) +{ + hdr_field_t *hf; + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the headers\n"); + return -1; + } + + hf = msg->record_route; + while(hf) { + if (parse_rr(hf) < 0) { + LM_ERR("failed to parse Record-Route\n"); + return -1; + } + + hf = next_sibling_hdr(hf); + } + return 0; +} + +/*! + * Parse all Route header + */ +int parse_route_headers(sip_msg_t *msg) +{ + hdr_field_t *hf; + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse the headers\n"); + return -1; + } + + hf = msg->route; + while(hf) { + if (parse_rr(hf) < 0) { + LM_ERR("failed to parse Record-Route\n"); + return -1; + } + + hf = next_sibling_hdr(hf); + } + return 0; +} diff --git a/src/core/parser/parse_rr.h b/src/core/parser/parse_rr.h index f7379a6035..7c38a2d38d 100644 --- a/src/core/parser/parse_rr.h +++ b/src/core/parser/parse_rr.h @@ -180,4 +180,7 @@ int print_rr_body(struct hdr_field *iroute, str *oroute, int order, int get_path_dst_uri(str *_p, str *_dst); +int parse_record_route_headers(sip_msg_t *msg); +int parse_route_headers(sip_msg_t *msg); + #endif /* PARSE_RR_H */

1 0

git:master:8f04fd24: core: mem - expose qm_report() in header file
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 8f04fd24c8f0d9edc88b5c3ff734560bb10735ee URL: https://github.com/kamailio/kamailio/commit/8f04fd24c8f0d9edc88b5c3ff734560… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T11:30:38+01:00 core: mem - expose qm_report() in header file --- Modified: src/core/mem/q_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/8f04fd24c8f0d9edc88b5c3ff734560… Patch: https://github.com/kamailio/kamailio/commit/8f04fd24c8f0d9edc88b5c3ff734560… --- diff --git a/src/core/mem/q_malloc.h b/src/core/mem/q_malloc.h index 85d3c86e60..cfcb43eced 100644 --- a/src/core/mem/q_malloc.h +++ b/src/core/mem/q_malloc.h @@ -167,6 +167,7 @@ void qm_check(struct qm_block*); void qm_status(void*); void qm_info(void*, struct mem_info*); +void qm_report(void* qmp, mem_report_t *mrep); unsigned long qm_available(void* qm);

1 0

git:master:9f7edfbd: misc/fuzz: use parse_contact_headers() instead of parse_contact_header()
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 9f7edfbd9f3b5fdb660043048a4c3a517483016e URL: https://github.com/kamailio/kamailio/commit/9f7edfbd9f3b5fdb660043048a4c3a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T11:20:54+01:00 misc/fuzz: use parse_contact_headers() instead of parse_contact_header() --- Modified: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/9f7edfbd9f3b5fdb660043048a4c3a5… Patch: https://github.com/kamailio/kamailio/commit/9f7edfbd9f3b5fdb660043048a4c3a5… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index 1c813fd715..d832ff3d92 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -38,7 +38,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { parse_to_uri(&orig_inv); - parse_contact_header(&orig_inv); + parse_contact_headers(&orig_inv); parse_refer_to_header(&orig_inv);

1 0

git:master:5c99d7f8: sanity: use dedicated functions for parsing From/To URIs
by Daniel-Constantin Mierla 14 Mar '22

14 Mar '22

Module: kamailio Branch: master Commit: 5c99d7f87ed94cd52c6ab74d46f511447b3db2b9 URL: https://github.com/kamailio/kamailio/commit/5c99d7f87ed94cd52c6ab74d46f5114… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-14T10:23:58+01:00 sanity: use dedicated functions for parsing From/To URIs - updates to parsing Contact headers --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/5c99d7f87ed94cd52c6ab74d46f5114… Patch: https://github.com/kamailio/kamailio/commit/5c99d7f87ed94cd52c6ab74d46f5114…

1 0

[kamailio/kamailio] module keepalive bug report (Issue #3028)
by 狐狐 14 Mar '22

14 Mar '22

### Description Ka servers A(172.22.247.37) and B(172.22.247.232) use the keepalive module to check if each other's status is available. When one server such as B is down, server A will still send about 16 OPTIONS messages. When A sends the 14th or 15th OPTIONS, ka on A will change B's status to down. At this point, if B restarts, B will reply 200OK to A’s OPTIONS message, and A will change B's status to alive, but A will not send OPTIONS message to B any more. Even if B dies later, B's status will be alive on A forever. ps: if B is restart at the 14th OPTIONS or earlier, A will correctly send heartbeat OPTIONS to B later. if B is restart at the 16th or later, A will not change B's status to alive, and certainly will not sends OPTIONS to B anymore, but this is correct isn't it? question is obviously B’s status is alive on A, but A sends no OPTIONS to B. ### Troubleshooting ![image](https://user-images.githubusercontent.com/26111722/154245407-93f3ac77-3c22-4129-9877-9efa317007a5.png) ![image](https://user-images.githubusercontent.com/26111722/154245553-d19c8121-27ef-448b-933d-153843c61048.png) #### Reproduction 1. set keepalive config ant A ``` loadmodule "keepalive.so" modparam("keepalive","ping_interval",3) modparam("keepalive","destination","172.22.247.232") ``` use ka_is_alive function check B's status. 2. restart A server and confirm that the OPTIONS status is correct. 3. stop the B server until the number of retran messages reaches 15. 4. restart B server, and check OPTIONS #### Log Messages ![image](https://user-images.githubusercontent.com/26111722/154245407-93f3ac77-3c22-4129-9877-9efa317007a5.png) #### SIP Traffic ![image](https://user-images.githubusercontent.com/26111722/154245553-d19c8121-27ef-448b-933d-153843c61048.png) at the time that the arrow points to, 172.22.247.232's status is 1(refers to the log above). but notice that there is no OPTIONS message to 172.22.247.232 anymore. ![image](https://user-images.githubusercontent.com/26111722/154248962-fa6efd08-361c-4be1-b3cf-3c452d6b4e36.png) ![image](https://user-images.githubusercontent.com/26111722/154249002-f1c6b80e-2880-4c6b-bfb0-4a0f3963c6b8.png) ### Possible Solutions ### Additional Information * **Operating System**: ``` Linux localhost.localdomain 3.10.0-1127.el7.x86_64 #1 SMP Tue Mar 31 23:36:51 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux kamailio 5.5.2 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3028 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3028(a)github.com>

3 4

[kamailio/kamailio] segmentation fault on kamailio 5.4.4 (Issue #3040)
by descartin 14 Mar '22

14 Mar '22

hello all we have seen a segmentation fault on a kamailio 5.4.4 ``` #0 0x00007feb664346ad in print_lists (dlg=0x7feaa5f65290) at dlg_var.c:277 277 varlist = varlist->next; Missing separate debuginfos, use: debuginfo-install bzip2-libs-1.0.6-13.el7.x86_64 cyrus-sasl-lib-2.1.26-20.el7_2.x86_64 elfutils-libelf-0.166-2.el7.x86_64 elfutils-libs-0.166-2.el7.x86_64 glibc-2.17-157.el7_3.5.x86_64 jansson-2.10-1.el7.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-8.el7.x86_64 libattr-2.4.46-12.el7.x86_64 libcap-2.22-8.el7.x86_64 libcom_err-1.42.9-9.el7.x86_64 libcurl-7.29.0-35.el7.centos.x86_64 libev-4.15-7.el7.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-16.el7.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-6.el7.x86_64 libssh2-1.4.3-10.el7_2.1.x86_64 libuuid-2.23.2-33.el7_3.2.x86_64 libxml2-2.9.1-6.el7_2.3.x86_64 nspr-4.13.1-1.0.el7_3.x86_64 nss-3.28.4-1.2.el7_3.x86_64 nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64 nss-util-3.28.4-1.0.el7_3.x86_64 openldap-2.4.40-13.el7.x86_64 openssl-libs-1.0.2k-19.el7.x86_64 pcre-8.32-15.el7_2.1.x86_64 systemd-libs-219-30.el7_3.9.x86_64 xz-libs-5.2.2-1.el7.x86_64 zlib-1.2.7-17.el7.x86_64 (gdb) bt #0 0x00007feb664346ad in print_lists (dlg=0x7feaa5f65290) at dlg_var.c:277 #1 0x00007feb664367ff in pv_set_dlg_variable (msg=0x7feb6a881bd8, param=0x7feb6adc85a0, op=254, val=0x7ffea166a7a0) at dlg_var.c:443 #2 0x00000000004bbaf2 in lval_pvar_assign (h=0x7ffea166bbd0, msg=0x7feb6a881bd8, lv=0x7feb6adc8668, rv=0x7feb6adc87e8) at core/lvalue.c:352 #3 0x00000000004bc5f0 in lval_assign (h=0x7ffea166bbd0, msg=0x7feb6a881bd8, lv=0x7feb6adc8668, rve=0x7feb6adc87e0) at core/lvalue.c:400 #4 0x0000000000487ddf in do_action (h=0x7ffea166bbd0, a=0x7feb6adc8f80, msg=0x7feb6a881bd8) at core/action.c:1455 #5 0x0000000000489b1b in run_actions (h=0x7ffea166bbd0, a=0x7feb6adc8338, msg=0x7feb6a881bd8) at core/action.c:1581 #6 0x000000000047c6d7 in do_action (h=0x7ffea166bbd0, a=0x7feb6adce4c0, msg=0x7feb6a881bd8) at core/action.c:1067 #7 0x0000000000489b1b in run_actions (h=0x7ffea166bbd0, a=0x7feb6adc3190, msg=0x7feb6a881bd8) at core/action.c:1581 #8 0x000000000048a25f in run_top_route (a=0x7feb6adc3190, msg=0x7feb6a881bd8, c=0x7ffea166bbd0) at core/action.c:1666 #9 0x00007feb69eab0a2 in reply_received (p_msg=0x7feb6a881bd8) at t_reply.c:2543 #10 0x000000000059dc77 in do_forward_reply (msg=0x7feb6a881bd8, mode=0) at core/forward.c:764 #11 0x000000000059f949 in forward_reply (msg=0x7feb6a881bd8) at core/forward.c:865 #12 0x00000000005f095a in receive_msg ( buf=0xacec80 <buf.7134> "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 79.170.70.13;branch=z9hG4bK7837.ffc6315fbd54de1e6a00b32fa1cc0eda.1\r\nVia: SIP/2.0/UDP 79.170.66.28:5080;received=79.170.66.28;rport=5080;branch=z9hG4bK83ve3c7ty27QF"..., len=426, rcv_info=0x7ffea166c6c0) at core/receive.c:509 #13 0x00000000004e3cd7 in udp_rcv_loop () at core/udp_server.c:543 #14 0x0000000000429f56 in main_loop () at main.c:1689 #15 0x0000000000434034 in main (argc=15, argv=0x7ffea166cf58) at main.c:2876 ``` [Uploading core_kamailio_mia_osp_feb18.log…]() could you please take a look to the attached full backtrace? thanks a lot and regards david -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3040 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3040(a)github.com>

3 3

git:master:355c0210: core: parse sdp - removed redundant check
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 355c02106c95400c44833a89aeea68c61ba2f200 URL: https://github.com/kamailio/kamailio/commit/355c02106c95400c44833a89aeea68c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T21:41:06+01:00 core: parse sdp - removed redundant check --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/355c02106c95400c44833a89aeea68c… Patch: https://github.com/kamailio/kamailio/commit/355c02106c95400c44833a89aeea68c… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index d81413a0a5..404a20fee8 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -685,8 +685,7 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) return -1; } d2p = find_next_sdp_line_delimiter(d1p, bodylimit, delimiter, bodylimit); - if((d1p + delimiter.len + 2 > bodylimit) - || (d2p - d1p < delimiter.len + 2)) { + if(d2p - d1p < delimiter.len + 2) { LM_ERR("invalid format [%.*s]\n", (int)(d2p-d1p), d1p); return -1; }

1 0

git:master:7076904d: core: parse sdp - detect multipart invalid format
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 7076904d0f0980d6bfa0814e3b1a8c61ee0acecc URL: https://github.com/kamailio/kamailio/commit/7076904d0f0980d6bfa0814e3b1a8c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T21:36:16+01:00 core: parse sdp - detect multipart invalid format --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/7076904d0f0980d6bfa0814e3b1a8c6… Patch: https://github.com/kamailio/kamailio/commit/7076904d0f0980d6bfa0814e3b1a8c6… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index dc584e1c8b..d81413a0a5 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -685,6 +685,11 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t* _sdp) return -1; } d2p = find_next_sdp_line_delimiter(d1p, bodylimit, delimiter, bodylimit); + if((d1p + delimiter.len + 2 > bodylimit) + || (d2p - d1p < delimiter.len + 2)) { + LM_ERR("invalid format [%.*s]\n", (int)(d2p-d1p), d1p); + return -1; + } /* d2p is text limit for application parsing */ memset(&hf, 0, sizeof(struct hdr_field)); rest = eat_line(d1p + delimiter.len + 2, d2p - d1p - delimiter.len - 2);

1 0

git:master:11d9cf59: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 11d9cf595eb92c8eee74ab386db0c061ee1c63f0 URL: https://github.com/kamailio/kamailio/commit/11d9cf595eb92c8eee74ab386db0c06… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-11T13:31:20+01:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/11d9cf595eb92c8eee74ab386db0c06… Patch: https://github.com/kamailio/kamailio/commit/11d9cf595eb92c8eee74ab386db0c06…

1 0

git:master:70c38551: textops: remove_hf_match() returns true when a header is removed
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 70c385518829d07b2061678af4e2d7f21587e454 URL: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:21:48+01:00 textops: remove_hf_match() returns true when a header is removed --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… Patch: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index e47e7b65d1..e4de8600d2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -2243,7 +2243,7 @@ static int ki_remove_hf_match(sip_msg_t* msg, str* hname, str *op, str *expr) regex_t mre; regmatch_t pmatch; char c; - int ret = -1; + int ret = -2; memset(&mre, 0, sizeof(regex_t)); @@ -2330,9 +2330,6 @@ static int ki_remove_hf_match(sip_msg_t* msg, str* hname, str *op, str *expr) ret = 1; } } - if(ret==-1) { - ret = 2; - } done: if(vop==4) {

1 0

git:master:8b24f28e: textops: added remove_hf_match(hname, op, expr)
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 8b24f28e9949271d993a5f6cf814fe1de2ddbf6d URL: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:09:55+01:00 textops: added remove_hf_match(hname, op, expr) - remove headers with name hname that match the body with expr --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1… Patch: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1…

1 0

git:master:5c59e96a: textops: docs for remove_hf_match()
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 5c59e96a7d0a04bff13bde8be688fae8c4d664d9 URL: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:20:48+01:00 textops: docs for remove_hf_match() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… Patch: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 2a166f37a9..9805aac6aa 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1541,6 +1541,50 @@ remove_hf_idx("X-My-Header", "-1"); </example> </section> + <section id="textops.f.remove_hf_match"> + <title> + <function moreinfo="none">remove_hf_match(hname, op, expr)</function> + </title> + <para> + Remove from message all headers with name 'hname' matching the body + with expression <quote>expr</quote>, based on operator + <quote>op</quote>. + </para> + <para> + Returns true if at least one header is found and removed. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>hanem</emphasis> - name of the header. + </para> + </listitem> + <listitem> + <para><emphasis>op</emphasis> - operator - it can be: 'eq' - equal; + 'ne' - not equal; 'in' - include; 're' - regular expression match. + </para> + </listitem> + <listitem> + <para><emphasis>expr</emphasis> - expression to match. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>remove_hf_match</function> usage</title> + <programlisting format="linespecific"> +... +if(remove_hf_match("X-Info", "in", "^data")) { + # all headers with name "X-Info" that have the body matching regular + # expression "^data" are removed +} +... +</programlisting> + </example> + </section> + <section id="textops.f.has_body"> <title> <function moreinfo="none">has_body()</function>,

1 0

git:master:e64a1eb7: textops: reset counter for looping again in remove_hf_idx()
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: e64a1eb774284a720718878170e198147af67e50 URL: https://github.com/kamailio/kamailio/commit/e64a1eb774284a720718878170e1981… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T11:28:36+01:00 textops: reset counter for looping again in remove_hf_idx() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/e64a1eb774284a720718878170e1981… Patch: https://github.com/kamailio/kamailio/commit/e64a1eb774284a720718878170e1981… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index bfb5a54941..a3479c06fd 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1845,6 +1845,7 @@ static int ki_remove_hf_idx(sip_msg_t* msg, str* hname, int idx) pos = idx; again: + i = 0; for (hfi=msg->headers; hfi; hfi=hfi->next) { if (hfm.type!=HDR_OTHER_T && hfm.type!=HDR_ERROR_T) { if (hfm.type!=hfi->type) {

1 0

[kamailio/kamailio] ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc (PR #3050)
by Kristiyan Peychev 11 Mar '22

11 Mar '22

Fix issues where a non-zero terminated string would get passed to `parse_user_data`.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3050 -- Commit Summary -- * ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc -- File Changes -- M src/modules/ims_registrar_scscf/userdata_parser.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3050.patch https://github.com/kamailio/kamailio/pull/3050.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3050 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3050(a)github.com>

3 6

[kamailio/kamailio] ims_registrar_scscf: add a new contact state for notifications (PR #3051)
by Kristiyan Peychev 11 Mar '22

11 Mar '22

Add the `deregistered` state to IMS_Registrar_events_enum_t, allowing the registrar to distinguish between UE unregsitration, which do not require a notification to be sent, and network-originated deregistration requests.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3051 -- Commit Summary -- * ims_registrar_scscf: add a new contact state for notifications -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (5) M src/modules/ims_registrar_scscf/registrar_notify.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3051.patch https://github.com/kamailio/kamailio/pull/3051.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3051 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3051(a)github.com>

3 5

git:master:07b19ef0: ims_registrar_scscf: add a new contact state for notifications
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 07b19ef0604a48148f1bb14787516334820e5a3a URL: https://github.com/kamailio/kamailio/commit/07b19ef0604a48148f1bb1478751633… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T10:28:22+01:00 ims_registrar_scscf: add a new contact state for notifications Add the `deregistered` state to IMS_Registrar_events_enum_t, allowing the registrar to distinguish between UE unregsitration, which do not require a notification to be sent, and network-originated deregistration requests. --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/07b19ef0604a48148f1bb1478751633… Patch: https://github.com/kamailio/kamailio/commit/07b19ef0604a48148f1bb1478751633… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index 761b014624..4dd6223431 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -495,6 +495,7 @@ int event_reg(udomain_t* _d, impurecord_t* r_passed, ucontact_t* c_passed, int e //richard: we only use reg unreg expired and refresh case IMS_REGISTRAR_CONTACT_UNREGISTERED: + case IMS_REGISTRAR_CONTACT_DEREGISTERED: case IMS_REGISTRAR_CONTACT_UNREGISTERED_IMPLICIT: case IMS_REGISTRAR_CONTACT_REGISTERED: case IMS_REGISTRAR_CONTACT_REFRESHED: @@ -1967,7 +1968,8 @@ str get_reginfo_partial(impurecord_t *r, ucontact_t *c, int event_type, unsigned if (//richard we only use expired and unregistered (event_type == IMS_REGISTRAR_CONTACT_EXPIRED || - event_type == IMS_REGISTRAR_CONTACT_UNREGISTERED) + event_type == IMS_REGISTRAR_CONTACT_UNREGISTERED || + event_type == IMS_REGISTRAR_CONTACT_DEREGISTERED) ) { //check if impu record has any other active contacts - if not then set this to terminated - if so then keep this active //check if asserted is present in any of the path headers @@ -2011,6 +2013,7 @@ str get_reginfo_partial(impurecord_t *r, ucontact_t *c, int event_type, unsigned event = r_expired; expires = 0; break; + case IMS_REGISTRAR_CONTACT_DEREGISTERED: case IMS_REGISTRAR_CONTACT_UNREGISTERED: state = r_terminated; event = r_unregistered; diff --git a/src/modules/ims_registrar_scscf/registrar_notify.h b/src/modules/ims_registrar_scscf/registrar_notify.h index 6bfc6d3ce3..04d4958488 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.h +++ b/src/modules/ims_registrar_scscf/registrar_notify.h @@ -116,7 +116,8 @@ typedef enum { IMS_REGISTRAR_CONTACT_EXPIRED, /**< A contact has expired and will be removed */ IMS_REGISTRAR_CONTACT_UNREGISTERED, /**< User unregistered with Expires 0 */ IMS_REGISTRAR_CONTACT_UNREGISTERED_IMPLICIT, /**< User unregistered implicitly, ie not via explicit deregister */ - IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE + IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE, + IMS_REGISTRAR_CONTACT_DEREGISTERED, /**< User's registration was terminated with RTR */ } IMS_Registrar_events_enum_t; extern IMS_Registrar_events_enum_t IMS_Registrar_events;

1 0

git:master:0e0bdbf8: ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 0e0bdbf83c7f20bf1814fb58232f8c25e29dd94d URL: https://github.com/kamailio/kamailio/commit/0e0bdbf83c7f20bf1814fb58232f8c2… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T10:27:56+01:00 ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc Fix issues where a non-zero terminated string would get passed to `parse_user_data`. --- Modified: src/modules/ims_registrar_scscf/userdata_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/0e0bdbf83c7f20bf1814fb58232f8c2… Patch: https://github.com/kamailio/kamailio/commit/0e0bdbf83c7f20bf1814fb58232f8c2… --- diff --git a/src/modules/ims_registrar_scscf/userdata_parser.c b/src/modules/ims_registrar_scscf/userdata_parser.c index 4880f0289c..d8b08b5491 100644 --- a/src/modules/ims_registrar_scscf/userdata_parser.c +++ b/src/modules/ims_registrar_scscf/userdata_parser.c @@ -916,7 +916,7 @@ static ims_subscription* parse_ims_subscription(xmlDocPtr doc, xmlNodePtr root) /** * Parses the user data XML and copies data into a new ims_subscription structure. - * @param xml - the input xml (NB must be null terminated) + * @param xml - the input xml * @returns the ims_subscription* on success or NULL on error */ ims_subscription *parse_user_data(str xml) @@ -927,7 +927,7 @@ ims_subscription *parse_user_data(str xml) if (!ctxtInit) parser_init(scscf_user_data_dtd,scscf_user_data_xsd); doc=0; - doc = xmlParseDoc((unsigned char *)xml.s); + doc = xmlParseMemory((unsigned char *)xml.s, xml.len); if (!doc){ LM_ERR("This is not a valid XML <%.*s>\n", xml.len,xml.s); goto error;

1 0

[kamailio/kamailio] ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP (PR #3048)
by riccardv 11 Mar '22

11 Mar '22

…es over TCP   #### Pre-Submission Checklist    - [ x] Commit message has the format required by CONTRIBUTING guide - [ x] Commits are split per component (core, individual modules, libs, utils, ...) - [ x] Each component has a single commit (if not, squash them into one commit) - [x ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3048 -- Commit Summary -- * ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (16) M src/modules/ims_ipsec_pcscf/ipsec.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3048.patch https://github.com/kamailio/kamailio/pull/3048.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3048 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3048(a)github.com>

3 5

git:master:79bb2b1c: ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP
by Daniel-Constantin Mierla 11 Mar '22

11 Mar '22

Module: kamailio Branch: master Commit: 79bb2b1c4e5a446a333d837d4ccb1038303340e5 URL: https://github.com/kamailio/kamailio/commit/79bb2b1c4e5a446a333d837d4ccb103… Author: Rikyz <xxxxxx@xxxxxx> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T10:27:26+01:00 ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/79bb2b1c4e5a446a333d837d4ccb103… Patch: https://github.com/kamailio/kamailio/commit/79bb2b1c4e5a446a333d837d4ccb103… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 82099367ba..f8672a592a 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -846,17 +846,15 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // for Reply get the dest proto from the received request dst_proto = req->rcv.proto; + // for Reply and TCP sends from P-CSCF server port, for Reply and UDP sends from P-CSCF client port + src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; + + // for Reply and TCP sends to UE client port, for Reply and UDP sends to UE server port + dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; + // Check send socket struct socket_info * client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); - if(client_sock) { - // for Reply and TCP sends from P-CSCF server port, for Reply and UDP sends from P-CSCF client port - src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; - - // for Reply and TCP sends to UE client port, for Reply and UDP sends to UE server port - dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; - } - else - { + if(!client_sock) { src_port = s->port_pc; dst_port = s->port_us; } diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index e874abaa34..16dda61b8c 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -184,7 +184,7 @@ int add_sa(struct mnl_socket* nl_sock, const struct ip_addr *src_addr_param, con if(strncasecmp(r_alg.s, "hmac-md5-96", r_alg.len) == 0) { strcpy(l_auth_algo->alg_name,"md5"); } - else if(strncasecmp(r_alg.s, "hmac-sha1-96", r_alg.len) == 0) { + else if(strncasecmp(r_alg.s, "hmac-sha-1-96", r_alg.len) == 0) { strcpy(l_auth_algo->alg_name,"sha1"); } else { // set default algorithm to sha1

1 0

git:master:69ee44c4: corex: use ZSW() for shm report rpc output
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: 69ee44c4cf83447bab2104b5d380f01af3893608 URL: https://github.com/kamailio/kamailio/commit/69ee44c4cf83447bab2104b5d380f01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T11:45:34+01:00 corex: use ZSW() for shm report rpc output --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/69ee44c4cf83447bab2104b5d380f01… Patch: https://github.com/kamailio/kamailio/commit/69ee44c4cf83447bab2104b5d380f01… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index f605ef2795..b66d6e237d 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -108,24 +108,24 @@ static void corex_rpc_shm_report(rpc_t* rpc, void* ctx) "used_frags", mrep.used_frags, "total_frags", mrep.total_frags, "max_free_frag_size", mrep.max_free_frag_size, - "max_free_frag_file", mrep.max_free_frag_file, - "max_free_frag_func", mrep.max_free_frag_func, - "max_free_frag_mname", mrep.max_free_frag_mname, + "max_free_frag_file", ZSW(mrep.max_free_frag_file), + "max_free_frag_func", ZSW(mrep.max_free_frag_func), + "max_free_frag_mname", ZSW(mrep.max_free_frag_mname), "max_free_frag_line", mrep.max_free_frag_line, "max_used_frag_size", mrep.max_used_frag_size, - "max_used_frag_file", mrep.max_used_frag_file, - "max_used_frag_func", mrep.max_used_frag_func, - "max_used_frag_mname", mrep.max_used_frag_mname, + "max_used_frag_file", ZSW(mrep.max_used_frag_file), + "max_used_frag_func", ZSW(mrep.max_used_frag_func), + "max_used_frag_mname", ZSW(mrep.max_used_frag_mname), "max_used_frag_line", mrep.max_used_frag_line, "min_free_frag_size", mrep.min_free_frag_size, - "min_free_frag_file", mrep.min_free_frag_file, - "min_free_frag_func", mrep.min_free_frag_func, - "min_free_frag_mname", mrep.min_free_frag_mname, + "min_free_frag_file", ZSW(mrep.min_free_frag_file), + "min_free_frag_func", ZSW(mrep.min_free_frag_func), + "min_free_frag_mname", ZSW(mrep.min_free_frag_mname), "min_free_frag_line", mrep.min_free_frag_line, "min_used_frag_size", mrep.min_used_frag_size, - "min_used_frag_file", mrep.min_used_frag_file, - "min_used_frag_func", mrep.min_used_frag_func, - "min_used_frag_mname", mrep.min_used_frag_mname, + "min_used_frag_file", ZSW(mrep.min_used_frag_file), + "min_used_frag_func", ZSW(mrep.min_used_frag_func), + "min_used_frag_mname", ZSW(mrep.min_used_frag_mname), "min_used_frag_line", mrep.min_used_frag_line ); }

1 0

git:master:647a734f: core: mem - use macro for setting qm report fields
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: 647a734f07537272f1235415f2712f770bc3f350 URL: https://github.com/kamailio/kamailio/commit/647a734f07537272f1235415f2712f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T11:19:26+01:00 core: mem - use macro for setting qm report fields --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/647a734f07537272f1235415f2712f7… Patch: https://github.com/kamailio/kamailio/commit/647a734f07537272f1235415f2712f7… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 69de680d76..2ff295fcb1 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -1028,6 +1028,14 @@ void qm_sums(void* qmp) "-----------------------------\n"); } +#define QM_REPORT_SET(MREP, FRAG, FIELD) do { \ + MREP->FIELD ## _size = FRAG->size; \ + MREP->FIELD ## _file = FRAG->file; \ + MREP->FIELD ## _func = FRAG->func; \ + MREP->FIELD ## _mname = FRAG->mname; \ + MREP->FIELD ## _line = FRAG->line; \ + } while(0) + void qm_report(void* qmp, mem_report_t *mrep) { struct qm_block* qm; @@ -1050,67 +1058,34 @@ void qm_report(void* qmp, mem_report_t *mrep) mrep->free_frags++; mrep->free_size_m += f->size; if(mrep->max_free_frag_size==0) { - mrep->max_free_frag_size = f->size; - mrep->max_free_frag_file = f->file; - mrep->max_free_frag_func = f->func; - mrep->max_free_frag_mname = f->mname; - mrep->max_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_free_frag); } else { if(f->size > mrep->max_free_frag_size) { - mrep->max_free_frag_size = f->size; - mrep->max_free_frag_file = f->file; - mrep->max_free_frag_func = f->func; - mrep->max_free_frag_mname = f->mname; - mrep->max_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_free_frag); } } if(mrep->min_free_frag_size==0) { - mrep->min_free_frag_size = f->size; - mrep->min_free_frag_file = f->file; - mrep->min_free_frag_func = f->func; - mrep->min_free_frag_mname = f->mname; - mrep->min_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_free_frag); } else { if(f->size < mrep->min_free_frag_size) { - mrep->min_free_frag_size = f->size; - mrep->min_free_frag_file = f->file; - mrep->min_free_frag_func = f->func; - mrep->min_free_frag_mname = f->mname; - mrep->min_free_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_free_frag); } } } else { mrep->used_frags++; mrep->used_size_m += f->size; if(mrep->max_used_frag_size==0) { - mrep->max_used_frag_size = f->size; - mrep->max_used_frag_file = f->file; - mrep->max_used_frag_func = f->func; - mrep->max_used_frag_mname = f->mname; - mrep->max_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_used_frag); } else { if(f->size > mrep->max_used_frag_size) { - mrep->max_used_frag_size = f->size; - mrep->max_used_frag_size = f->size; - mrep->max_used_frag_file = f->file; - mrep->max_used_frag_func = f->func; - mrep->max_used_frag_mname = f->mname; - mrep->max_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, max_used_frag); } } if(mrep->min_used_frag_size==0) { - mrep->min_used_frag_size = f->size; - mrep->min_used_frag_file = f->file; - mrep->min_used_frag_func = f->func; - mrep->min_used_frag_mname = f->mname; - mrep->min_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_used_frag); } else { if(f->size < mrep->min_used_frag_size) { - mrep->min_used_frag_size = f->size; - mrep->min_used_frag_file = f->file; - mrep->min_used_frag_func = f->func; - mrep->min_used_frag_mname = f->mname; - mrep->min_used_frag_line = f->line; + QM_REPORT_SET(mrep, f, min_used_frag); } } }

1 0

git:master:1c5b26d0: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: 1c5b26d0b6e2c43741d7b37341bfe49a78d7697a URL: https://github.com/kamailio/kamailio/commit/1c5b26d0b6e2c43741d7b37341bfe49… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-10T11:01:25+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/1c5b26d0b6e2c43741d7b37341bfe49… Patch: https://github.com/kamailio/kamailio/commit/1c5b26d0b6e2c43741d7b37341bfe49…

1 0

[kamailio/kamailio] siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring (PR #3049)
by Dennis 10 Mar '22

10 Mar '22

siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring - Added X-Siptrace headers in core callback mode for SIP URI traffic duplication, headers also available in event route for filtering purporses.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3049 -- Commit Summary -- * siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring -- File Changes -- M src/modules/siptrace/siptrace.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3049.patch https://github.com/kamailio/kamailio/pull/3049.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3049 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3049(a)github.com>

3 3

git:master:57b1d537: siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: 57b1d5375927b987b162fcf0e2c99a39b717bd65 URL: https://github.com/kamailio/kamailio/commit/57b1d5375927b987b162fcf0e2c99a3… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:48:59+01:00 siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring - Added X-Siptrace headers in core callback mode for SIP URI traffic duplication, headers also available in event route for filtering purporses. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/57b1d5375927b987b162fcf0e2c99a3… Patch: https://github.com/kamailio/kamailio/commit/57b1d5375927b987b162fcf0e2c99a3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index d7416506dd..2c2fc48404 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2070,6 +2070,11 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) return -1; } + if(_siptrace_mode & SIPTRACE_MODE_URI) { + if(sip_trace_xheaders_write(sto) != 0) + return -1; + } + memset(&msg, 0, sizeof(sip_msg_t)); msg.buf = sto->body.s; msg.len = sto->body.len;

1 0

[kamailio/kamailio] smsops: Fix ucs2-to-utf8 for Accent chars (PR #3043)
by alexyosifov 10 Mar '22

10 Mar '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3043 -- Commit Summary -- * smsops: Fix ucs2-to-utf8 for Accent chars -- File Changes -- M src/modules/smsops/smsops_impl.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3043.patch https://github.com/kamailio/kamailio/pull/3043.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3043 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3043(a)github.com>

2 2

git:master:f9f16a6c: smsops: Fix ucs2-to-utf8 for Accent chars
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: f9f16a6c700a7378fc30f6f9c0a767438fc638b9 URL: https://github.com/kamailio/kamailio/commit/f9f16a6c700a7378fc30f6f9c0a7674… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:46:26+01:00 smsops: Fix ucs2-to-utf8 for Accent chars --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/f9f16a6c700a7378fc30f6f9c0a7674… Patch: https://github.com/kamailio/kamailio/commit/f9f16a6c700a7378fc30f6f9c0a7674… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 909ccde4e2..9d1e19c237 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -479,7 +479,7 @@ int gsm_to_ascii(char* buffer, int buffer_length, str sms, const int fill_bits) int ucs2_to_utf8 (int ucs2, char * utf8) { if (ucs2 < 0x80) { utf8[0] = ucs2; - utf8[1] = 0; + utf8[1] = 0; return 1; } if (ucs2 >= 0x80 && ucs2 < 0x800) { @@ -888,7 +888,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Length is worst-case 2 * len (UCS2 is 2 Bytes, UTF8 is worst-case 4 Bytes) rp_data->pdu.payload.sm.len = 0; while (len > 0) { - j = (body.s[p] << 8) + body.s[p + 1]; + j = ((unsigned char)body.s[p] << 8) + (unsigned char)body.s[p + 1]; p += 2; rp_data->pdu.payload.sm.len += ucs2_to_utf8(j, &rp_data->pdu.payload.sm.s[rp_data->pdu.payload.sm.len]); len -= 2;

1 0

[kamailio/kamailio] Master uac (PR #3047)
by Stefan Mititelu 10 Mar '22

10 Mar '22

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR adds 1 UAC module function and 1 TM module modparam. It enables "uac:reply" event route trigger on timeout or non-2xx replies. Basically it: - adds TMCB_ON_FAILURE callback for UAC - copies the TM uac content into uas; thus failure route will have the uas to work with. => this part of the code was already there, i just enabled it via (another) modparam. So far, is basically tested on our side, without any apparent issues. More testing will follow. Please have a look on this and tell me what you think about it. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3047 -- Commit Summary -- * uac: add new function uac_req_send_fr() * tm: Add enable_uac_fr modparam -- File Changes -- M src/modules/tm/config.c (5) M src/modules/tm/config.h (1) M src/modules/tm/doc/params.xml (16) M src/modules/tm/tm.c (1) M src/modules/tm/uac.c (2) M src/modules/uac/api.h (2) M src/modules/uac/doc/uac_admin.xml (27) M src/modules/uac/uac.c (1) M src/modules/uac/uac_send.c (23) M src/modules/uac/uac_send.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3047.patch https://github.com/kamailio/kamailio/pull/3047.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3047 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3047(a)github.com>

2 6

git:master:b3c301e1: uac: trigger event route for failure and timeout
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: b3c301e1c99eb90df1533724442aef7991cd36bc URL: https://github.com/kamailio/kamailio/commit/b3c301e1c99eb90df1533724442aef7… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:46:04+01:00 uac: trigger event route for failure and timeout ...when $uac_req(evroute) = 2 --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/b3c301e1c99eb90df1533724442aef7… Patch: https://github.com/kamailio/kamailio/commit/b3c301e1c99eb90df1533724442aef7… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 188d1b913e..3ce59d3e11 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1241,11 +1241,20 @@ failure_route[REMOTE_AUTH] { <function moreinfo="none">event_route[uac:reply]</function> </title> <para> - Event route executed for the final reply of the branch for the - request sent with uac_req_send(). The associated $uac_req(evroute) - has to be set to 1. If the request is challenged for authentication + The associated $uac_req(evroute) can have either of the following values: + <itemizedlist> + <listitem><para> + <emphasis>1</emphasis> : event route executed for the <emphasis>final reply</emphasis> of the branch for the + request sent with uac_req_send(). If the request is challenged for authentication with 401/407, then the event_route is executed twice, first for 401/407 and second for final reply of the transaction. + </para></listitem> + <listitem><para> + <emphasis>2</emphasis> : event route executed for <emphasis>failure</emphasis> of the branch for the + request sent with uac_req_send(). event route will execute also for timeout. + In order for this to work, please also enable TM module "enable_uac_fr" modparam. + </para></listitem> + </itemizedlist> </para> <example> <title><function>event_route[uac:reply]</function> usage</title> diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 43767c7804..887dc1b4a4 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -886,9 +886,21 @@ int uac_req_send(void) return -1; } - uac_r.cb_flags = TMCB_LOCAL_COMPLETED; - /* Callback function */ - uac_r.cb = uac_send_tm_callback; + switch (_uac_req.evroute) + { + + case 2: + uac_r.cb_flags = TMCB_ON_FAILURE; + /* Callback function */ + uac_r.cb = uac_resend_tm_callback; + break; + case 1: + default: + uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + /* Callback function */ + uac_r.cb = uac_send_tm_callback; + break; + } /* Callback parameter */ uac_r.cbp = (void*)tp; }

1 0

git:master:d3f25a5d: tm: Add enable_uac_fr modparam
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: d3f25a5dd0139677a66792141fff075475085a03 URL: https://github.com/kamailio/kamailio/commit/d3f25a5dd0139677a66792141fff075… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:46:04+01:00 tm: Add enable_uac_fr modparam --- Modified: src/modules/tm/config.c Modified: src/modules/tm/config.h Modified: src/modules/tm/doc/params.xml Modified: src/modules/tm/tm.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/d3f25a5dd0139677a66792141fff075… Patch: https://github.com/kamailio/kamailio/commit/d3f25a5dd0139677a66792141fff075… --- diff --git a/src/modules/tm/config.c b/src/modules/tm/config.c index 3bfd007ba0..5c5ea58590 100644 --- a/src/modules/tm/config.c +++ b/src/modules/tm/config.c @@ -95,7 +95,8 @@ struct cfg_group_tm default_tm_cfg = { CANCELs; on by default */ 1, /* e2e_cancel_reason -- copy the Reason headers from incoming CANCELs into the corresp. hop-by-hop CANCELs, on by default */ - 0 /* relay_100 -- by default, assume stateful proxy and do not relay SIP 100 */ + 0, /* relay_100 -- by default, assume stateful proxy and do not relay SIP 100 */ + 0 /* enable_uac_fr */ }; void *tm_cfg = &default_tm_cfg; @@ -206,5 +207,7 @@ cfg_def_t tm_cfg_def[] = { " the corresponding generated hop-by-hop CANCELs"}, {"relay_100", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, "if set to 1, relay SIP 100 messages as a stateless proxy"}, + {"enable_uac_fr", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "if set, enables failure route for UAC messages"}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/tm/config.h b/src/modules/tm/config.h index 17be5416a6..47f05e0c4c 100644 --- a/src/modules/tm/config.h +++ b/src/modules/tm/config.h @@ -130,6 +130,7 @@ struct cfg_group_tm { int local_cancel_reason; int e2e_cancel_reason; unsigned int relay_100; + int enable_uac_fr; }; extern struct cfg_group_tm default_tm_cfg; diff --git a/src/modules/tm/doc/params.xml b/src/modules/tm/doc/params.xml index ee305b891c..3f67ae3f4d 100644 --- a/src/modules/tm/doc/params.xml +++ b/src/modules/tm/doc/params.xml @@ -1607,4 +1607,20 @@ modparam("tm", "reply_relay_mode", 0) </example> </section> + <section id="tm.p.enable_uac_fr"> + <title><varname>enable_uac_fr</varname> (int)</title> + <para> + Enable failure route trigger, for uac. This will copy the tm uac into uas. + Thus, failure route can be triggered even for uac messages. + </para> + <example> + <title>enable_uac_fr example</title> + <programlisting> +... +modparam("tm", "enable_uac_fr", 1) +.... + </programlisting> + </example> + </section> + </section> diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index d8fc7caa19..69defa1f26 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -486,6 +486,7 @@ static param_export_t params[]={ {"event_callback_lres_sent", PARAM_STR, &_tm_event_callback_lres_sent }, {"exec_time_check" , PARAM_INT, &tm_exec_time_check_param }, {"reply_relay_mode", PARAM_INT, &tm_reply_relay_mode }, + {"enable_uac_fr", PARAM_INT, &default_tm_cfg.enable_uac_fr }, {0,0,0} }; diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 7dfcefb6ea..b7be8e3b38 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -548,7 +548,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, #ifdef USE_DNS_FAILOVER /* Set the outgoing message as UAS, so the failover code has something to work with */ - if(cfg_get(core, core_cfg, use_dns_failover)) { + if(cfg_get(core, core_cfg, use_dns_failover) || cfg_get(tm, tm_cfg, enable_uac_fr)) { if(likely(t_build_msg_from_buf(&lreq, buf, buf_len, uac_r, &dst) == 0)) { if (parse_headers(&lreq, HDR_EOH_F, 0) == -1) { LM_ERR("failed to parse headers on uas for failover\n");

1 0

[kamailio/kamailio] topos: handle BYE sent by callee during non connected call with provi… (PR #3046)
by Frédéric Gaisnon 10 Mar '22

10 Mar '22

…tional response sent by callee (INVITE,180 and BYE from callee instead CANCEL)   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  topos: handle BYE sent by callee during non connected call with provitional response sent by callee (INVITE,180 and BYE from callee instead CANCEL) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3046 -- Commit Summary -- * topos: handle BYE sent by callee during non connected call with provitional response sent by callee -- File Changes -- M src/modules/topos/tps_msg.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3046.patch https://github.com/kamailio/kamailio/pull/3046.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3046 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3046(a)github.com>

2 3

git:master:e1974977: topos: handle BYE sent by callee during non connected call with provitional response sent by callee
by Daniel-Constantin Mierla 10 Mar '22

10 Mar '22

Module: kamailio Branch: master Commit: e1974977a3e604996b752566d187b77da5072999 URL: https://github.com/kamailio/kamailio/commit/e1974977a3e604996b752566d187b77… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-10T10:43:05+01:00 topos: handle BYE sent by callee during non connected call with provitional response sent by callee (INVITE,180 and BYE from callee instead CANCEL) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/e1974977a3e604996b752566d187b77… Patch: https://github.com/kamailio/kamailio/commit/e1974977a3e604996b752566d187b77… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 854d2cdbc6..c7de5e514f 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -835,8 +835,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) if(tps_storage_load_dialog(msg, &mtsd, &stsd) < 0) { goto error; } - if(((get_cseq(msg)->method_id) & (METHOD_BYE|METHOD_PRACK|METHOD_UPDATE)) - && stsd.b_contact.len <= 0) { + if(((((get_cseq(msg)->method_id) & (METHOD_PRACK|METHOD_UPDATE)) + && stsd.b_contact.len <= 0)) || (((get_cseq(msg)->method_id) + & (METHOD_BYE) && stsd.b_contact.len <= 0) && (0 == dialog))) { /* no B-side contact, look for INVITE transaction record */ if((get_cseq(msg)->method_id) & (METHOD_UPDATE)) { /* detect direction - via from-tag */

1 0

git:master:b559a5de: corex: shm.report to print code location for fragments
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: master Commit: b559a5de7c948b678522eca2c7a05d4491690aad URL: https://github.com/kamailio/kamailio/commit/b559a5de7c948b678522eca2c7a05d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T17:16:39+01:00 corex: shm.report to print code location for fragments --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/b559a5de7c948b678522eca2c7a05d4… Patch: https://github.com/kamailio/kamailio/commit/b559a5de7c948b678522eca2c7a05d4… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 490aaadc83..f605ef2795 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -98,7 +98,7 @@ static void corex_rpc_shm_report(rpc_t* rpc, void* ctx) } shm_report(&mrep); rpc->add(ctx, "{", &th); - rpc->struct_add(th, "jjjjjjjjjjjj", + rpc->struct_add(th, "jjjjjjjjjsssjjsssjjsssjjsssj", "total_size", mrep.total_size, "free_size_s", mrep.free_size_s, "used_size_s", mrep.used_size_s, @@ -108,9 +108,25 @@ static void corex_rpc_shm_report(rpc_t* rpc, void* ctx) "used_frags", mrep.used_frags, "total_frags", mrep.total_frags, "max_free_frag_size", mrep.max_free_frag_size, + "max_free_frag_file", mrep.max_free_frag_file, + "max_free_frag_func", mrep.max_free_frag_func, + "max_free_frag_mname", mrep.max_free_frag_mname, + "max_free_frag_line", mrep.max_free_frag_line, "max_used_frag_size", mrep.max_used_frag_size, + "max_used_frag_file", mrep.max_used_frag_file, + "max_used_frag_func", mrep.max_used_frag_func, + "max_used_frag_mname", mrep.max_used_frag_mname, + "max_used_frag_line", mrep.max_used_frag_line, "min_free_frag_size", mrep.min_free_frag_size, - "min_used_frag_size", mrep.min_used_frag_size + "min_free_frag_file", mrep.min_free_frag_file, + "min_free_frag_func", mrep.min_free_frag_func, + "min_free_frag_mname", mrep.min_free_frag_mname, + "min_free_frag_line", mrep.min_free_frag_line, + "min_used_frag_size", mrep.min_used_frag_size, + "min_used_frag_file", mrep.min_used_frag_file, + "min_used_frag_func", mrep.min_used_frag_func, + "min_used_frag_mname", mrep.min_used_frag_mname, + "min_used_frag_line", mrep.min_used_frag_line ); }

1 0

git:master:fa0f802e: mem: store file, line, module and functions in memory reports
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: master Commit: fa0f802e9042afb9142378943397d45f727bb86a URL: https://github.com/kamailio/kamailio/commit/fa0f802e9042afb9142378943397d45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T11:46:14+01:00 mem: store file, line, module and functions in memory reports --- Modified: src/core/mem/meminfo.h Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/fa0f802e9042afb9142378943397d45… Patch: https://github.com/kamailio/kamailio/commit/fa0f802e9042afb9142378943397d45…

1 0

Kamailio v5.4.8 Released
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Hello, Kamailio SIP Server v5.4.8 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.7. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.8. Note that 5.4 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.5, with v5.5.4 being release out of it. For more details about version 5.4.8 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2022/03/kamailio-v5-4-8-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online March 28-31, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:5.4:b71435ad: ChangeLog: content updated for v5.4.8
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.4 Commit: b71435ad2fff4ef141ef20bfff8e593165c64268 URL: https://github.com/kamailio/kamailio/commit/b71435ad2fff4ef141ef20bfff8e593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T10:44:43+01:00 ChangeLog: content updated for v5.4.8 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/b71435ad2fff4ef141ef20bfff8e593… Patch: https://github.com/kamailio/kamailio/commit/b71435ad2fff4ef141ef20bfff8e593…

1 0

git:5.4:0d1d1bbd: Makefile.defs: version set to 5.4.8
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.4 Commit: 0d1d1bbde1ca1574ebc2ed7b99df55351c368800 URL: https://github.com/kamailio/kamailio/commit/0d1d1bbde1ca1574ebc2ed7b99df553… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:38:47+01:00 Makefile.defs: version set to 5.4.8 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0d1d1bbde1ca1574ebc2ed7b99df553… Patch: https://github.com/kamailio/kamailio/commit/0d1d1bbde1ca1574ebc2ed7b99df553… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index dde2e6055e..546cdafa57 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:a29b9f76: pkg/kamailio/deb: version set 5.4.8
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.4 Commit: a29b9f7672676104e1a63ad5bd75871e95976956 URL: https://github.com/kamailio/kamailio/commit/a29b9f7672676104e1a63ad5bd75871… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:31:21+01:00 pkg/kamailio/deb: version set 5.4.8 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/a29b9f7672676104e1a63ad5bd75871… Patch: https://github.com/kamailio/kamailio/commit/a29b9f7672676104e1a63ad5bd75871…

1 0

git:5.4:cab4d20a: pkg: version set to 5.4.8 for rpms and apline
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.4 Commit: cab4d20aad64eae480ddc7cc84f6e50e6c14db15 URL: https://github.com/kamailio/kamailio/commit/cab4d20aad64eae480ddc7cc84f6e50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:31:45+01:00 pkg: version set to 5.4.8 for rpms and apline --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cab4d20aad64eae480ddc7cc84f6e50… Patch: https://github.com/kamailio/kamailio/commit/cab4d20aad64eae480ddc7cc84f6e50… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index b9d6a15066..a85e00af85 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.7 +pkgver=5.4.8 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index f99f13696d..ee9c08e0b8 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.7 +%define ver 5.4.8 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing Kamailio v.5.4.8
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Hello, I am planning to release a new version from branch 5.4, respectively 5.4.8, sometime next week, likely on Wednesday or Thursday (Mar 9/10, 2022). If anyone is aware of issues not yet reported to bug tracker or missing backports, report them in order to try to get the fixes in this release. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online March 28-31, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

2 3

git:5.4:0e545fa3: cplc: manage case where TZ environment variable is not set.
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.4 Commit: 0e545fa3dd8221c76a6abe11b7a90a752be30e6c URL: https://github.com/kamailio/kamailio/commit/0e545fa3dd8221c76a6abe11b7a90a7… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:12:51+01:00 cplc: manage case where TZ environment variable is not set. (cherry picked from commit 2ea56a4cf40045bb92b1f17f5a0b8c172da4f866) (cherry picked from commit 67d888c80f5c9e96da72a1dab234f2a70782f635) --- Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/0e545fa3dd8221c76a6abe11b7a90a7… Patch: https://github.com/kamailio/kamailio/commit/0e545fa3dd8221c76a6abe11b7a90a7… --- diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index 9bb90dc5db..035d8d06e4 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -815,7 +815,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) /* does the recv_time match the specified interval? */ j = cpl_check_tmrec( &trt, &att, 0); /* restore the orig TZ */ - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); /* free structs that I don't need any more */ cpl_ac_tm_free( &att ); @@ -848,7 +848,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) cpl_tmrec_free( &trt ); return DEFAULT_ACTION; runtime_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt ); @@ -857,7 +857,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) LM_ERR("error parsing attr [%d][%s]\n", attr_name,attr_str?(char*)attr_str:"NULL"); script_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt );

1 0

git:5.5:67d888c8: cplc: manage case where TZ environment variable is not set.
by Daniel-Constantin Mierla 09 Mar '22

09 Mar '22

Module: kamailio Branch: 5.5 Commit: 67d888c80f5c9e96da72a1dab234f2a70782f635 URL: https://github.com/kamailio/kamailio/commit/67d888c80f5c9e96da72a1dab234f2a… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-09T09:09:38+01:00 cplc: manage case where TZ environment variable is not set. (cherry picked from commit 2ea56a4cf40045bb92b1f17f5a0b8c172da4f866) --- Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/67d888c80f5c9e96da72a1dab234f2a… Patch: https://github.com/kamailio/kamailio/commit/67d888c80f5c9e96da72a1dab234f2a… --- diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index c3c8572f4c..e2d15bfbb3 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -815,7 +815,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) /* does the recv_time match the specified interval? */ j = cpl_check_tmrec( &trt, &att, 0); /* restore the orig TZ */ - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); /* reset flags */ flags &= (1<<7); @@ -850,7 +850,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) cpl_tmrec_free( &trt ); return DEFAULT_ACTION; runtime_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt ); @@ -859,7 +859,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) LM_ERR("error parsing attr [%d][%s]\n", attr_name,attr_str?(char*)attr_str:"NULL"); script_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt );

1 0

git:master:3719888c: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 07 Mar '22

07 Mar '22

Module: kamailio Branch: master Commit: 3719888c2d6df492e48a07e04682930abba07e71 URL: https://github.com/kamailio/kamailio/commit/3719888c2d6df492e48a07e04682930… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-07T14:16:19+01:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/3719888c2d6df492e48a07e04682930… Patch: https://github.com/kamailio/kamailio/commit/3719888c2d6df492e48a07e04682930… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index 84a7c37eba..e9039e5341 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -53,6 +53,7 @@ Patric Marschall 3.26. db_update_as_insert (string) 3.27. default_db_url(str) 3.28. matching_mode(int) + 3.29. UTC_timestamps(int) 4. Changes from usrloc module @@ -124,8 +125,9 @@ Patric Marschall 1.26. Set db_update_as_insert parameter 1.27. Set default_db_type parameter 1.28. Set matching_mode parameter - 1.29. Set db_mode parameter - 1.30. Example database content - reg_table (locdb) table + 1.29. Set UTC_timestamps parameter + 1.30. Set db_mode parameter + 1.31. Example database content - reg_table (locdb) table Chapter 1. User's Guide @@ -167,6 +169,7 @@ Chapter 1. User's Guide 3.26. db_update_as_insert (string) 3.27. default_db_url(str) 3.28. matching_mode(int) + 3.29. UTC_timestamps(int) 4. Changes from usrloc module @@ -285,6 +288,7 @@ Warning 3.26. db_update_as_insert (string) 3.27. default_db_url(str) 3.28. matching_mode(int) + 3.29. UTC_timestamps(int) 3.1. write_db_url (string) @@ -680,6 +684,17 @@ modparam("p_usrloc", "matching_mode", 2) kamcmd cfg.set_now_int p_usrloc matching_mode 2 kamcmd cfg.get p_usrloc matching_mode +3.29. UTC_timestamps(int) + + Enables UTC timestamps for expires and last_modified columns. + + Default value is 0 (disabled). + + Example 1.29. Set UTC_timestamps parameter +... +modparam("p_usrloc", "UTC_timestamps", 1) +... + 4. Changes from usrloc module 4.1. db_mode (integer) @@ -702,7 +717,7 @@ kamcmd cfg.get p_usrloc matching_mode Default value is 3. - Example 1.29. Set db_mode parameter + Example 1.30. Set db_mode parameter ... modparam("p_usrloc", "db_mode", 2) ... @@ -736,7 +751,7 @@ modparam("p_usrloc", "db_mode", 2) complete database documentation on the project webpage, https://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. - Example 1.30. Example database content - reg_table (locdb) table + Example 1.31. Example database content - reg_table (locdb) table ... +----+----+------+--------+--------+---------------------+-------+----+ | id | no | url | status | errors | failover | spare | rg |

1 0

[kamailio/kamailio] p_usrloc: add UTC_timestamps parameter (PR #3036)
by Stefan Mititelu 07 Mar '22

07 Mar '22

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Enable UTC time format for expires and last_modified columns. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3036 -- Commit Summary -- * p_usrloc: add UTC_timestamps parameter -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (22) M src/modules/p_usrloc/p_usrloc_mod.c (18) M src/modules/p_usrloc/p_usrloc_mod.h (4) M src/modules/p_usrloc/ucontact.c (12) M src/modules/p_usrloc/udomain.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3036.patch https://github.com/kamailio/kamailio/pull/3036.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3036 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3036(a)github.com>

3 4

git:master:4e26551f: p_usrloc: add UTC_timestamps parameter
by Stefan Mititelu 07 Mar '22

07 Mar '22

Module: kamailio Branch: master Commit: 4e26551f3529876beafd318f30ffc5f0cf92cda1 URL: https://github.com/kamailio/kamailio/commit/4e26551f3529876beafd318f30ffc5f… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2022-03-07T15:11:15+02:00 p_usrloc: add UTC_timestamps parameter --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ucontact.c Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/4e26551f3529876beafd318f30ffc5f… Patch: https://github.com/kamailio/kamailio/commit/4e26551f3529876beafd318f30ffc5f…

1 0

git:master:96efbdad: snmpstats: fix build, update memory field
by Victor Seva 07 Mar '22

07 Mar '22

Module: kamailio Branch: master Commit: 96efbdad0e9ed320657f56c3a0b4a5e54b1cdd5c URL: https://github.com/kamailio/kamailio/commit/96efbdad0e9ed320657f56c3a0b4a5e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-07T09:20:39+01:00 snmpstats: fix build, update memory field > CC (gcc) [M snmpstats.so] kamailioServer.o > kamailioServer.c: In function 'handle_kamailioSrvFreeMemory': > kamailioServer.c:193:37: error: 'struct mem_info' has no member named 'free' > 193 | int freememory = (int)_stats_shm_mi.free; > | ^ > make[2]: *** [../../Makefile.rules:100: kamailioServer.o] Error 1 > make[1]: *** [Makefile:511: modules] Error 1 changes introduced at fb8727b3e1b9fc4f4278809ef9cdea93e96ae77a --- Modified: src/modules/snmpstats/kamailioServer.c --- Diff: https://github.com/kamailio/kamailio/commit/96efbdad0e9ed320657f56c3a0b4a5e… Patch: https://github.com/kamailio/kamailio/commit/96efbdad0e9ed320657f56c3a0b4a5e… --- diff --git a/src/modules/snmpstats/kamailioServer.c b/src/modules/snmpstats/kamailioServer.c index 1bd7e70854..163c73f8b0 100644 --- a/src/modules/snmpstats/kamailioServer.c +++ b/src/modules/snmpstats/kamailioServer.c @@ -190,7 +190,7 @@ int handle_kamailioSrvFreeMemory(netsnmp_mib_handler *handler, netsnmp_agent_request_info *reqinfo, netsnmp_request_info *requests) { stats_shm_update(); - int freememory = (int)_stats_shm_mi.free; + int freememory = (int)_stats_shm_mi.free_size; switch(reqinfo->mode) {

1 0

git:master:fffcfdf8: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: fffcfdf86aa8bd6ea417b593f9a5af2892cd6d1a URL: https://github.com/kamailio/kamailio/commit/fffcfdf86aa8bd6ea417b593f9a5af2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-04T13:31:34+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/fffcfdf86aa8bd6ea417b593f9a5af2… Patch: https://github.com/kamailio/kamailio/commit/fffcfdf86aa8bd6ea417b593f9a5af2… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index dc28b471ec..b3bc69a9fd 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -72,7 +72,8 @@ Muhammad Shahzad Shafi 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info - 5.8. corex.shm.stats + 5.8. corex.shm.report + 5.9. corex.shm.stats 6. Event Routes @@ -171,7 +172,8 @@ Chapter 1. Admin Guide 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info - 5.8. corex.shm.stats + 5.8. corex.shm.report + 5.9. corex.shm.stats 6. Event Routes @@ -751,7 +753,8 @@ event_route[dispatcher:dst-down] { 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info - 5.8. corex.shm.stats + 5.8. corex.shm.report + 5.9. corex.shm.stats 5.1. corex.debug @@ -811,7 +814,14 @@ event_route[dispatcher:dst-down] { Example: kamcli rpc shm.info -5.8. corex.shm.stats +5.8. corex.shm.report + + Return shared memory manager usage report. + + Example: + kamcli rpc shm.report + +5.9. corex.shm.stats Return shared memory statistics (values are in bytes).

1 0

git:master:2d9de91d: corex: add shm.report rpc command
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: 2d9de91df94ca686968a307d18902f51d59a9c18 URL: https://github.com/kamailio/kamailio/commit/2d9de91df94ca686968a307d18902f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T13:20:46+01:00 corex: add shm.report rpc command --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/2d9de91df94ca686968a307d18902f5… Patch: https://github.com/kamailio/kamailio/commit/2d9de91df94ca686968a307d18902f5… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 4c1d3c820c..490aaadc83 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -79,9 +79,45 @@ static void corex_rpc_shm_stats(rpc_t* rpc, void* c) ); } +static const char* corex_rpc_shm_report_doc[2] = { + "Return shared memory report", + 0 +}; + +/* + * RPC command to return shm report + */ +static void corex_rpc_shm_report(rpc_t* rpc, void* ctx) +{ + mem_report_t mrep; + void *th; + + if(_shm_root.xreport==NULL) { + rpc->fault(ctx, 500, "No report callback function"); + return; + } + shm_report(&mrep); + rpc->add(ctx, "{", &th); + rpc->struct_add(th, "jjjjjjjjjjjj", + "total_size", mrep.total_size, + "free_size_s", mrep.free_size_s, + "used_size_s", mrep.used_size_s, + "real_used_s", mrep.real_used_s, + "max_used_s", mrep.max_used_s, + "free_frags", mrep.free_frags, + "used_frags", mrep.used_frags, + "total_frags", mrep.total_frags, + "max_free_frag_size", mrep.max_free_frag_size, + "max_used_frag_size", mrep.max_used_frag_size, + "min_free_frag_size", mrep.min_free_frag_size, + "min_used_frag_size", mrep.min_used_frag_size + ); +} + rpc_export_t corex_rpc_shm_cmds[] = { - {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, - {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, + {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, + {"shm.report", corex_rpc_shm_report, corex_rpc_shm_report_doc, 0}, + {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:8a58717c: corex: docs for shm.report rpc command
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: 8a58717c5d81989e835a7c30bd6a1e5954c59a0b URL: https://github.com/kamailio/kamailio/commit/8a58717c5d81989e835a7c30bd6a1e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T13:27:57+01:00 corex: docs for shm.report rpc command --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a58717c5d81989e835a7c30bd6a1e5… Patch: https://github.com/kamailio/kamailio/commit/8a58717c5d81989e835a7c30bd6a1e5… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 6a1b94e021..da9d8ea101 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -1020,6 +1020,20 @@ event_route[dispatcher:dst-down] { <programlisting format="linespecific"> &kamcli; rpc shm.info </programlisting> + </section> + <section id="corex.rpc.shm.report"> + <title> + <function moreinfo="none">corex.shm.report</function> + </title> + <para> + Return shared memory manager usage report. + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &kamcli; rpc shm.report + </programlisting> </section> <section id="corex.rpc.shm.stats"> <title>

1 0

git:master:72a4e0e9: core: mem - added api function for getting usage report for qm manager
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: 72a4e0e90e95e2088b995bbe49bad5324edd9b09 URL: https://github.com/kamailio/kamailio/commit/72a4e0e90e95e2088b995bbe49bad53… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T13:18:58+01:00 core: mem - added api function for getting usage report for qm manager - combine internal memory manager stats with metrics computed on the fly by walking all memory fragments --- Modified: src/core/mem/memapi.h Modified: src/core/mem/meminfo.h Modified: src/core/mem/pkg.c Modified: src/core/mem/pkg.h Modified: src/core/mem/q_malloc.c Modified: src/core/mem/shm.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/72a4e0e90e95e2088b995bbe49bad53… Patch: https://github.com/kamailio/kamailio/commit/72a4e0e90e95e2088b995bbe49bad53…

1 0

git:master:fb8727b3: kex: updated memory info fields
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: fb8727b3e1b9fc4f4278809ef9cdea93e96ae77a URL: https://github.com/kamailio/kamailio/commit/fb8727b3e1b9fc4f4278809ef9cdea9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:44:21+01:00 kex: updated memory info fields --- Modified: src/modules/kex/core_stats.c Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/fb8727b3e1b9fc4f4278809ef9cdea9… Patch: https://github.com/kamailio/kamailio/commit/fb8727b3e1b9fc4f4278809ef9cdea9… --- diff --git a/src/modules/kex/core_stats.c b/src/modules/kex/core_stats.c index ec543d1b60..565ce4e77d 100644 --- a/src/modules/kex/core_stats.c +++ b/src/modules/kex/core_stats.c @@ -869,7 +869,7 @@ unsigned long shm_stats_get_size(void) unsigned long shm_stats_get_used(void) { stats_shm_update(); - return _stats_shm_rpc.used; + return _stats_shm_rpc.used_size; } unsigned long shm_stats_get_rused(void) @@ -887,7 +887,7 @@ unsigned long shm_stats_get_mused(void) unsigned long shm_stats_get_free(void) { stats_shm_update(); - return _stats_shm_rpc.free; + return _stats_shm_rpc.free_size; } unsigned long shm_stats_get_frags(void) diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index 102442f1e9..15ce1dcf2c 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -99,8 +99,8 @@ int pkg_proc_stats_myinit(int rank) /* init pkg usage values */ pkg_info(&info); - _pkg_proc_stats_list[process_no].available = info.free; - _pkg_proc_stats_list[process_no].used = info.used; + _pkg_proc_stats_list[process_no].available = info.free_size; + _pkg_proc_stats_list[process_no].used = info.used_size; _pkg_proc_stats_list[process_no].real_used = info.real_used; _pkg_proc_stats_list[process_no].total_size = info.total_size; _pkg_proc_stats_list[process_no].total_frags = info.total_frags; @@ -132,8 +132,8 @@ static int pkg_proc_update_stats(sr_event_param_t *evp) if(unlikely(process_no>=_pkg_proc_stats_no)) return -1; pkg_info(&info); - _pkg_proc_stats_list[process_no].available = info.free; - _pkg_proc_stats_list[process_no].used = info.used; + _pkg_proc_stats_list[process_no].available = info.free_size; + _pkg_proc_stats_list[process_no].used = info.used_size; _pkg_proc_stats_list[process_no].real_used = info.real_used; _pkg_proc_stats_list[process_no].total_frags = info.total_frags; return 0;

1 0

git:master:f65c98cf: core: parser - check value of pointer with white space code
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: f65c98cf74e4495a6e892a701980c4b691a3390b URL: https://github.com/kamailio/kamailio/commit/f65c98cf74e4495a6e892a701980c4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:43:13+01:00 core: parser - check value of pointer with white space code --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/f65c98cf74e4495a6e892a701980c4b… Patch: https://github.com/kamailio/kamailio/commit/f65c98cf74e4495a6e892a701980c4b… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 9fae1f7448..c2b817f3e4 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -376,7 +376,7 @@ int extract_ice_option(str *body, sdp_stream_cell_t *stream) return -1; ptr_src = body->s + 14; - if (ptr_src == 32) ptr_src++; /* if starts with a space, skip it */ + if (*ptr_src == 32) ptr_src++; /* if starts with a space, skip it */ /* identify all existing ICE options, if they are listed in one row */ while (*ptr_src && *ptr_src != '\r' && *ptr_src != '\n' && max_options-->0)

1 0

git:master:6695b6fc: corex: updated memory info fields
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: 6695b6fcb830b379e3d2aea4d7d35daba8e30317 URL: https://github.com/kamailio/kamailio/commit/6695b6fcb830b379e3d2aea4d7d35da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:43:59+01:00 corex: updated memory info fields --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/6695b6fcb830b379e3d2aea4d7d35da… Patch: https://github.com/kamailio/kamailio/commit/6695b6fcb830b379e3d2aea4d7d35da… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 615fb892bc..4c1d3c820c 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -71,8 +71,8 @@ static void corex_rpc_shm_stats(rpc_t* rpc, void* c) rpc->add(c, "{", &th); rpc->struct_add(th, "jjjjjj", "total", mi.total_size, - "free", mi.free, - "used", mi.used, + "free", mi.free_size, + "used", mi.used_size, "real_used", mi.real_used, "max_used", mi.max_used, "fragments", mi.total_frags

1 0

git:master:27d71da5: core: mem - renamed memory info fields
by Daniel-Constantin Mierla 04 Mar '22

04 Mar '22

Module: kamailio Branch: master Commit: 27d71da5da8a2f33a74e35765ba00ef83a20186f URL: https://github.com/kamailio/kamailio/commit/27d71da5da8a2f33a74e35765ba00ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-04T09:26:07+01:00 core: mem - renamed memory info fields - avoid conflict with keywords like free --- Modified: src/core/core_cmd.c Modified: src/core/mem/f_malloc.c Modified: src/core/mem/meminfo.h Modified: src/core/mem/q_malloc.c Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/27d71da5da8a2f33a74e35765ba00ef… Patch: https://github.com/kamailio/kamailio/commit/27d71da5da8a2f33a74e35765ba00ef… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index d045a144cb..c464d3686e 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -598,8 +598,8 @@ static void core_shmmem(rpc_t* rpc, void* c) rpc->add(c, "{", &handle); rpc->struct_add(handle, "dddddd", "total", (unsigned int)(mi.total_size>>rs), - "free", (unsigned int)(mi.free>>rs), - "used", (unsigned int)(mi.used>>rs), + "free", (unsigned int)(mi.free_size>>rs), + "used", (unsigned int)(mi.used_size>>rs), "real_used",(unsigned int)(mi.real_used>>rs), "max_used", (unsigned int)(mi.max_used>>rs), "fragments", (unsigned int)mi.total_frags diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index 38f686ff2c..6cb98addc1 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -951,8 +951,8 @@ void fm_info(void* qmp, struct mem_info* info) memset(info,0, sizeof(*info)); info->total_size=qm->size; info->min_frag=MIN_FRAG_SIZE; - info->free=qm->size-qm->real_used; - info->used=qm->used; + info->free_size=qm->size-qm->real_used; + info->used_size=qm->used; info->real_used=qm->real_used; info->max_used=qm->max_real_used; info->total_frags=qm->ffrags; diff --git a/src/core/mem/meminfo.h b/src/core/mem/meminfo.h index 8b69daa705..9a823c49fe 100644 --- a/src/core/mem/meminfo.h +++ b/src/core/mem/meminfo.h @@ -19,7 +19,7 @@ /** * \file * \brief Memory manager (malloc) informations and statistics - * + * * Memory manager (malloc) informations and statistics, like the used memory, * fragmentations etc.. * \ingroup mem @@ -34,8 +34,8 @@ /** Memory information structure */ struct mem_info{ unsigned long total_size; /** total size of memory pool */ - unsigned long free; /** free memory */ - unsigned long used; /** allocated size */ + unsigned long free_size; /** free memory */ + unsigned long used_size; /** allocated size */ unsigned long real_used; /** used size plus overhead from malloc */ unsigned long max_used; /** maximum used size since server start? */ unsigned long min_frag; /** minimum number of fragmentations? */ diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index fb786ba635..403ee34da8 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -942,8 +942,8 @@ void qm_info(void* qmp, struct mem_info* info) memset(info,0, sizeof(*info)); info->total_size=qm->size; info->min_frag=MIN_FRAG_SIZE; - info->free=qm->size-qm->real_used; - info->used=qm->used; + info->free_size=qm->size-qm->real_used; + info->used_size=qm->used; info->real_used=qm->real_used; info->max_used=qm->max_real_used; info->total_frags=qm->ffrags; diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index 10db30264b..19b71a8be3 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -1178,11 +1178,11 @@ void tlsf_meminfo(tlsf_t pool, struct mem_info *info) { control_t* control = tlsf_cast(control_t*, pool); memset(info, 0, sizeof(*info)); - info->free = control->total_size - control->real_used; + info->free_size = control->total_size - control->real_used; info->max_used = control->max_used; info->real_used = control->real_used; info->total_frags = control->fragments; - info->used = control->allocated; + info->used_size = control->allocated; info->total_size = control->total_size; }

1 0

[kamailio/kamailio] cdp: increase the amount of avps allocated when reading AVP_Vendor_Sp… (PR #3031)
by kristiyan-peychev-flolive 03 Mar '22

03 Mar '22

…ecific_Application_Id   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I've ran into issues when working with certain HSS's that sent more AVP's than were allocated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3031 -- Commit Summary -- * cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id -- File Changes -- M src/modules/cdp/peerstatemachine.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3031.patch https://github.com/kamailio/kamailio/pull/3031.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3031 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3031(a)github.com>

2 1

git:master:62f7be22: cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id
by Daniel-Constantin Mierla 03 Mar '22

03 Mar '22

Module: kamailio Branch: master Commit: 62f7be2281f5dd91a5668c4b84e52a7d7169e21f URL: https://github.com/kamailio/kamailio/commit/62f7be2281f5dd91a5668c4b84e52a7… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-03T21:50:35+01:00 cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/62f7be2281f5dd91a5668c4b84e52a7… Patch: https://github.com/kamailio/kamailio/commit/62f7be2281f5dd91a5668c4b84e52a7… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index b83654bf1d..a4520d797d 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -732,7 +732,7 @@ void save_peer_applications(peer *p,AAAMessage *msg) total_cnt += supported_vendor_id_avp_cnt; break; case AVP_Vendor_Specific_Application_Id: - total_cnt+=2;/* wasteful, but let's skip decoding */ + total_cnt+=6;/* wasteful, but let's skip decoding */ break; } LM_DBG("Total count of applications is %d\n", total_cnt);

1 0

[kamailio/kamailio] Infinite loop in siptrace with core callback in traffic mirror mode. (Issue #3042)
by Dennis 03 Mar '22

03 Mar '22

### Description Infiinite loop in siptrace module when configured to pure mirroring (no HEP) with core events. #### Reproduction Simple config: listen=udp:XXX.XXX.XXX.XXX:5060 listen=udp:127.0.0.1:5080 debug=2 log_facility=LOG_LOCAL0 log_prefix="{$timef(%F %T) $mt $hdr(CSeq) $ci}" children=4 loadmodule "tm.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "xlog.so" loadmodule "ctl.so" loadmodule "siptrace.so" modparam("siptrace", "trace_on", 1) modparam("siptrace", "trace_mode", 4) modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "xheaders_write", 1) modparam("siptrace", "duplicate_uri", "sip:127.0.0.1:5888") modparam("siptrace", "send_sock_addr", "sip:127.0.0.1:5080") request_route { xinfo('>>>>> Request $rm from $si'); } event_route[siptrace:msg] { xinfo(">>>>> Siptrace event method $rm"); } #### Log Messages With received OPTIONS request: ``` Feb 28 13:54:52 kamailio systemd[1]: Starting Kamailio - the Open Source SIP Server... Feb 28 13:54:52 kamailio kamailio: INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Feb 28 13:54:52 kamailio kamailio: INFO: <core> [core/tcp_main.c:4997]: init_tcp(): using epoll_lt as the io watch method (auto detected) Feb 28 13:54:52 kamailio kamailio[12246]: Listening on Feb 28 13:54:52 kamailio kamailio[12246]: udp: 2607:beef:be:beef:5054:ff:fe4b:dd25:5060 Feb 28 13:54:52 kamailio kamailio[12246]: udp: 127.0.0.1:5080 Feb 28 13:54:52 kamailio kamailio[12246]: Aliases: Feb 28 13:54:52 kamailio kamailio[12246]: udp: localhost:5080 Feb 28 13:54:52 kamailio kamailio[12246]: udp: kamailio:5060 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: siptrace [siptrace.c:410]: mod_init(): can't load dlg api. Will not install dialog callbacks. Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [main.c:3030]: main(): processes (at least): 14 - shm size: 67108864 - pkg size: 8388608 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Feb 28 13:54:52 kamailio /usr/sbin/kamailio[12273]: INFO: ctl [io_listener.c:214]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) Feb 28 13:54:52 kamailio systemd[1]: Started Kamailio - the Open Source SIP Server. Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:53 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS ... Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12262]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: INFO: <script>: >>>>> Siptrace event method OPTIONS Feb 28 13:54:54 kamailio kernel: [271505.656348] kamailio[12262]: segfault at 7ffdf9d8fff8 ip 00007f3bfeb6f256 sp 00007ffdf9d90000 error 6 in pv.so[7f3bfeaf3000+e0000] Feb 28 13:54:54 kamailio kernel: [271505.715015] kamailio[12263]: segfault at 7ffdf9d8fff8 ip 00007f3bfeb6f256 sp 00007ffdf9d90000 error 6 in pv.so[7f3bfeaf3000+e0000] Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12263]: message repeated 872 times: [ INFO: <script>: >>>>> Siptrace event method OPTIONS] Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12274]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 9 Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12259]: ALERT: <core> [main.c:788]: handle_sigs(): child process 12262 exited by a signal 11 Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12259]: ALERT: <core> [main.c:791]: handle_sigs(): core was generated Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12259]: INFO: <core> [main.c:813]: handle_sigs(): terminating due to SIGCHLD Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12274]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12273]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12268]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12272]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12265]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12264]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12270]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12267]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12269]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12271]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received Feb 28 13:54:54 kamailio /usr/sbin/kamailio[12266]: INFO: <core> [main.c:868]: sig_usr(): signal 15 received ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 7.5.0 ``` * **Operating System**: ``` Ubuntu 18.04.6 LTS Linux 4.15.0-169-generic #177-Ubuntu SMP Thu Feb 3 10:50:38 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3042 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3042(a)github.com>

3 6

[kamailio/kamailio] cplc: manage case where TZ environment variable is not set. (PR #3045)
by Frédéric Gaisnon 03 Mar '22

03 Mar '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  cplc: manage case where TZ environment variable is not set. When TZ environment variable was not set, only the first time based CPL worked correctly. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3045 -- Commit Summary -- * cplc: manage case where TZ environment variable is not set. -- File Changes -- M src/modules/cplc/cpl_switches.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3045.patch https://github.com/kamailio/kamailio/pull/3045.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3045 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3045(a)github.com>

2 4

git:master:2ea56a4c: cplc: manage case where TZ environment variable is not set.
by Daniel-Constantin Mierla 03 Mar '22

03 Mar '22

Module: kamailio Branch: master Commit: 2ea56a4cf40045bb92b1f17f5a0b8c172da4f866 URL: https://github.com/kamailio/kamailio/commit/2ea56a4cf40045bb92b1f17f5a0b8c1… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-03T16:10:17+01:00 cplc: manage case where TZ environment variable is not set. --- Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/2ea56a4cf40045bb92b1f17f5a0b8c1… Patch: https://github.com/kamailio/kamailio/commit/2ea56a4cf40045bb92b1f17f5a0b8c1… --- diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index c3c8572f4c..e2d15bfbb3 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -815,7 +815,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) /* does the recv_time match the specified interval? */ j = cpl_check_tmrec( &trt, &att, 0); /* restore the orig TZ */ - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); /* reset flags */ flags &= (1<<7); @@ -850,7 +850,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) cpl_tmrec_free( &trt ); return DEFAULT_ACTION; runtime_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt ); @@ -859,7 +859,7 @@ static inline char *run_time_switch( struct cpl_interpreter *intr ) LM_ERR("error parsing attr [%d][%s]\n", attr_name,attr_str?(char*)attr_str:"NULL"); script_error: - if ( flags&(1<<7) ) + if ((flags&(1<<7)) && cpl_env.orig_tz.s && (cpl_env.orig_tz.len > 3)) set_TZ(cpl_env.orig_tz.s); cpl_ac_tm_free( &att ); cpl_tmrec_free( &trt );

1 0

git:5.4:e2614c01: topos_redis: contact on A side is never updated on dialog update
by Victor Seva 03 Mar '22

03 Mar '22

Module: kamailio Branch: 5.4 Commit: e2614c014faf61fd1c6f1dccf0264589bf44698f URL: https://github.com/kamailio/kamailio/commit/e2614c014faf61fd1c6f1dccf026458… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-03T10:15:31+01:00 topos_redis: contact on A side is never updated on dialog update (cherry picked from commit 86d233d34b06016fc3436ca4574155959d24bb16) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/e2614c014faf61fd1c6f1dccf026458… Patch: https://github.com/kamailio/kamailio/commit/e2614c014faf61fd1c6f1dccf026458… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index fe366403c8..6dd77b0d4a 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1260,7 +1260,7 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &td_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, argv, argvlen);

1 0

git:5.5:5c0ac5a8: topos_redis: contact on A side is never updated on dialog update
by Victor Seva 03 Mar '22

03 Mar '22

Module: kamailio Branch: 5.5 Commit: 5c0ac5a847022ca43ed2b3607c5be183132b679c URL: https://github.com/kamailio/kamailio/commit/5c0ac5a847022ca43ed2b3607c5be18… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-03T10:14:59+01:00 topos_redis: contact on A side is never updated on dialog update (cherry picked from commit 86d233d34b06016fc3436ca4574155959d24bb16) --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5c0ac5a847022ca43ed2b3607c5be18… Patch: https://github.com/kamailio/kamailio/commit/5c0ac5a847022ca43ed2b3607c5be18… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 0d21cbc2d1..456d54ebee 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1321,7 +1321,7 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &td_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, argv, argvlen);

1 0

[kamailio/kamailio] topos_redis: contact on A side is never updated on dialog update (PR #3044)
by Frédéric Gaisnon 03 Mar '22

03 Mar '22

#### Pre-Submission Checklist    - [x ] Commit message has the format required by CONTRIBUTING guide - [x ] Commits are split per component (core, individual modules, libs, utils, ...) - [x ] Each component has a single commit (if not, squash them into one commit) - [x ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x ] PR should be backported to stable branches - [x ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  topos_redis: contact on A side is never updated on dialog update You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3044 -- Commit Summary -- * topos_redis: contact on A side is never updated on dialog update -- File Changes -- M src/modules/topos_redis/topos_redis_storage.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3044.patch https://github.com/kamailio/kamailio/pull/3044.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3044 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3044(a)github.com>

2 2

git:master:86d233d3: topos_redis: contact on A side is never updated on dialog update
by Victor Seva 03 Mar '22

03 Mar '22

Module: kamailio Branch: master Commit: 86d233d34b06016fc3436ca4574155959d24bb16 URL: https://github.com/kamailio/kamailio/commit/86d233d34b06016fc3436ca45741559… Author: frederic <frederic.gaisnon(a)mmtt.fr> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-03T10:13:02+01:00 topos_redis: contact on A side is never updated on dialog update --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/86d233d34b06016fc3436ca45741559… Patch: https://github.com/kamailio/kamailio/commit/86d233d34b06016fc3436ca45741559… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 0d21cbc2d1..456d54ebee 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1321,7 +1321,7 @@ int tps_redis_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &td_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &td_key_b_contact, argv, argvlen);

1 0

git:master:bf73dcec: blst: remove log level and function name from debug message
by Daniel-Constantin Mierla 03 Mar '22

03 Mar '22

Module: kamailio Branch: master Commit: bf73dcec994887b473ee2b76f6f21b9c845f62f5 URL: https://github.com/kamailio/kamailio/commit/bf73dcec994887b473ee2b76f6f21b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-03T09:14:09+01:00 blst: remove log level and function name from debug message --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/bf73dcec994887b473ee2b76f6f21b9… Patch: https://github.com/kamailio/kamailio/commit/bf73dcec994887b473ee2b76f6f21b9… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 1c2773c53c..79cf47548a 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -273,8 +273,7 @@ static int ki_blst_is_blocklisted(sip_msg_t* msg) if (dst_is_blocklisted(&src, msg)) return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_is_blocklisted:" - " blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ LM_WARN("blocklist support not compiled-in - no effect -\n");

1 0

git:master:415f2080: blst: docs - small formatting updates
by Daniel-Constantin Mierla 03 Mar '22

03 Mar '22

Module: kamailio Branch: master Commit: 415f20804e423b503d5e0d1743e28c9f509f9c21 URL: https://github.com/kamailio/kamailio/commit/415f20804e423b503d5e0d1743e28c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-03T09:03:12+01:00 blst: docs - small formatting updates --- Modified: src/modules/blst/doc/blst_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/415f20804e423b503d5e0d1743e28c9… Patch: https://github.com/kamailio/kamailio/commit/415f20804e423b503d5e0d1743e28c9… --- diff --git a/src/modules/blst/doc/blst_functions.xml b/src/modules/blst/doc/blst_functions.xml index 96b4b6c389..48e7d59b6e 100644 --- a/src/modules/blst/doc/blst_functions.xml +++ b/src/modules/blst/doc/blst_functions.xml @@ -38,15 +38,15 @@ else </title> <para> Adds the source of the current message to the blocklist for - the time interval specified in the <emphasis>Retry-After</emphasis> + the time interval specified in the <emphasis>Retry-After</emphasis> header. - If the <emphasis>Retry-After</emphasis> header is missing, it will + If the <emphasis>Retry-After</emphasis> header is missing, it will fail (returns false). - If the <emphasis>Retry-After</emphasis> value is less than - <varname>min</varname>, then <varname>min</varname> seconds will be + If the <emphasis>Retry-After</emphasis> value is less than + <varname>min</varname>, then <varname>min</varname> seconds will be used instead. If the <emphasis>Retry-After</emphasis> value is greater than - <varname>max</varname>, then <varname>max</varname> seconds will be + <varname>max</varname>, then <varname>max</varname> seconds will be used instead. </para> <example> @@ -117,7 +117,7 @@ if (msg_status==503){ # blocklist 503 source for Retry-After seconds works for local replies to the current message. </para> <para> - The variants of these functions with no parameters will ignore + The variants of these functions with no parameters will ignore everything (equivalent to passing 0xff). </para> <para>

1 0

[kamailio/kamailio] There is no jwt.so (#2883)
by hance2010 02 Mar '22

02 Mar '22

### Description ``` apt install kamailio kamailio-* find /usr/lib/x86_64-linux-gnu/kamailio/modules -name jwt.so and nothing. ```  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio5.5.2 ``` * **Operating System**:  ``` debian10 ``` -- 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/2883

5 7

git:5.4:b927b944: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.4 Commit: b927b9447a69e7ded4ba279e1384115bb760e5d5 URL: https://github.com/kamailio/kamailio/commit/b927b9447a69e7ded4ba279e1384115… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-02T13:31:49+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siputils/README Modified: src/modules/statsc/README Modified: src/modules/tm/README Modified: src/modules/xmlops/README --- Diff: https://github.com/kamailio/kamailio/commit/b927b9447a69e7ded4ba279e1384115… Patch: https://github.com/kamailio/kamailio/commit/b927b9447a69e7ded4ba279e1384115…

1 0

git: new commits in branch 5.4
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

- URL: https://github.com/kamailio/kamailio/commit/08bbba6aebab8de80a935b76991f4b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:50:52+01:00 core: parser - detect pai/ppi headers spanning many lines - GH #2837 (cherry picked from commit f0e8898d83c54e5e4383b70ba54ad340c5ae13b6) (cherry picked from commit 9427586f3af4dacfa2b3293ea6c5813a6b6c1e5c) - URL: https://github.com/kamailio/kamailio/commit/ffe4fa42f9d17d8c7a38bbd4e5ee678… Author: Zion Dials <me(a)ziondials.com> Date: 2022-03-02T12:51:37+01:00 Fix TM Module Doc unmatched_cancel param (cherry picked from commit c060e9000f9c6cca98e23bef7aa8c295c8863de6) (cherry picked from commit a2969015b92667a728c0ec8df64adb99859b5f84) - URL: https://github.com/kamailio/kamailio/commit/7a97d92b318e54af68ab2854a20d692… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:52:15+01:00 nat_traversal: declare flag literal as unsigned - GH #2954 (cherry picked from commit 8c30109df0b479cc3fce39a765717149e9c70ddf) (cherry picked from commit 4814bac2424db7fea2ba817fcdf4594a7b2e1c11) - URL: https://github.com/kamailio/kamailio/commit/e07f0af4e980f98622088c00b444bd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:52:32+01:00 core: flags - use unsigned literal for bit shifting operations (cherry picked from commit 1a406e093ea7ac07428c92aec21ac67f8caa1093) (cherry picked from commit 2c196d149c19ee59174f89020407e1f15156182e) - URL: https://github.com/kamailio/kamailio/commit/d40c394d177af95a55c16759d0d3132… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2022-03-02T12:52:41+01:00 db_cluster: Fix spelling errors (cherry picked from commit 2eed551ed55fcd2bc190e1045da377f6b1e4d22d) (cherry picked from commit 0d77ae82ff1cac93a48ede3558ddf48632960a70) - URL: https://github.com/kamailio/kamailio/commit/e5815318171bbdb9c3642149255eb12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:53:22+01:00 src/Makefile.defs: link -lrt if glibc <= 2.17 - GH #2921 (cherry picked from commit 743a9d33dcc3a6220bba217c14810dafb53355b2) (cherry picked from commit 0afcccdc46950c5b4a49024e2092ab712ba6be94) - URL: https://github.com/kamailio/kamailio/commit/aec3e22400b5a1978ee124007f71213… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2022-03-02T12:53:41+01:00 websockets: enable KEEPALIVE_MECHANISM_CONCHECK KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled (cherry picked from commit 29c3b865d8efde8435c2217df44d1df684caaea2) (cherry picked from commit 88b50be127ca0dab57784e0ffb96d6eb44196772) - URL: https://github.com/kamailio/kamailio/commit/94a7f11d6cb5ec27a287cd084cd7ba9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:53:56+01:00 core: parser - print start of buffer on error for identity info (cherry picked from commit 48dc90dfa1839a405e7d090b23c1fdc907107731) (cherry picked from commit dc5eda219c152d1c08ba38849163849f62242b2d) - URL: https://github.com/kamailio/kamailio/commit/6b5be83292e365540912dd5df0754e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:54:17+01:00 core: parser/sdp - cast to unsigned for left shifting (cherry picked from commit c1ec3857f360c806b7cc856b8e6ae3d5362ef49f) (cherry picked from commit f387209ca7efd65a1fd7ee510d899fec6e080289) - URL: https://github.com/kamailio/kamailio/commit/478037908535e9bc27a65c2dd0867d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:54:29+01:00 core: parser/sdp - coherent indentation of two functions (cherry picked from commit 1b5756ae9f67c3907c134eb725f19c875cccd913) (cherry picked from commit 4b9987bd630d78aa27ea392491989ddfeeda0d98) - URL: https://github.com/kamailio/kamailio/commit/88ba7c1c30a1c6bbe93a1e2a3093f58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:54:41+01:00 core: parser/sdp - check for delimiter size done before comparison (cherry picked from commit b83810eb1eb70f326698db874a1f67cf6a8d06cf) (cherry picked from commit d7c030f576fa87b5959b7156c6b2077d76bb1fee) - URL: https://github.com/kamailio/kamailio/commit/673d32b4c1d7aff80f93ba8473bba5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:55:08+01:00 presence: info logs instead of error for not maching conditions (cherry picked from commit f42b6c5cf2ee9861cb1eed016a5ddcc499d2b854) (cherry picked from commit 27875047db766cc7cb3a4d5d7638bdafd98e09b1) - URL: https://github.com/kamailio/kamailio/commit/7f04a6575dcbfc5b5a47ab342f698bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:55:22+01:00 Makefile.defs: use sed instead of awk for detecting glibc version (cherry picked from commit 225a59475c91e154ce0a7f0ec252be841a5a8ce5) (cherry picked from commit 17bbfe97179a2965b145b946b76ba458c2af8bd5) - URL: https://github.com/kamailio/kamailio/commit/2bea8c5fe3e8af5faf42b6cba04cef9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:55:39+01:00 core: parser - clang format for parse_identityinfo.c (cherry picked from commit 1cd480dfe6f2e06bac99b74e466e0c6bb8801279) (cherry picked from commit a2446f5194446ab9432aecde99522e709ecdc1e3) - URL: https://github.com/kamailio/kamailio/commit/24fac1820b7efa70425e220a8b85953… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:55:56+01:00 misc/examples: kemi - sanity check for response in lua script (cherry picked from commit 96ba8bdf87221c985d8198fe36f7f0bd9858a738) (cherry picked from commit d06fbbea95b33934d841f37bff6ae2b32dde2f87) - URL: https://github.com/kamailio/kamailio/commit/4cf259b53864ce3f0d17699c4f64d2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:56:13+01:00 core: parser - clang format parser_f.c (cherry picked from commit 03acf834a19689d6c3efcea93e48985d3e7ffc37) (cherry picked from commit 5d08f4028ad6f805940d1824e17fb148bd90a045) - URL: https://github.com/kamailio/kamailio/commit/ab264fe6ea2680a0b837f665bd76a61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:56:24+01:00 core: parser sdp - check if delimiter exceeds body limit (cherry picked from commit bd5280726a9842b257afabae548853d000ecd249) (cherry picked from commit fb06dbf3e0452f1b4e8772da3fa94d6bd930f238) - URL: https://github.com/kamailio/kamailio/commit/084bdf50a56a9f11f935fb792f22cfe… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2022-03-02T12:56:46+01:00 dlgs: optimize dlgs_init, if/else path are identical (cherry picked from commit 8e7f2e6a158bb2c59600b03be3c7e6eefc416180) (cherry picked from commit 5715fc40664438e092d444ea31b99c965c26da7e) - URL: https://github.com/kamailio/kamailio/commit/2be54b7385cbc76c6a24639ebf77386… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:57:01+01:00 misc/examples: kemi - update lua sample config (cherry picked from commit 99a9f27c8d24a06f201b4713f7a2bfeb37092482) (cherry picked from commit 97bc9751485dfd9aa314e15aaef73b0835e580cf) - URL: https://github.com/kamailio/kamailio/commit/fb4d740ecdce111e49f57eb77d53519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:57:14+01:00 misc/examples: kemi - sanity checks for response in python script (cherry picked from commit bd42130e3cfb87856b4b0431de50eccdd4324f9f) (cherry picked from commit 0ba7876e5cc1120d7e64e779ba9327ed33e88a19) - URL: https://github.com/kamailio/kamailio/commit/c2584c5e8b5b5bb52a16ce072e938a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:57:26+01:00 auth_identity: close file in case of errors - GH #2983 (cherry picked from commit 84cdc33429c61fe7cac91cbedf96bef560267313) (cherry picked from commit 42e3c28f2744ee4c799c972bed56e412f792027e) - URL: https://github.com/kamailio/kamailio/commit/932386739ee62cfc3353b45ae435d29… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2022-03-02T12:57:37+01:00 ldap: rename private function ldap_connect When compiling against openldap 2.6.0 kamailio's private ldap_connect() clashes with openldap's own. curl dealt with a similar issue earlier (see [1]). Simply rename the function to avoid the issue. In file included from ldap_api_fn.c:37: ldap_connect.h:34:12: error: conflicting types for 'ldap_connect'; have 'int(char *)' 34 | extern int ldap_connect(char *_ld_name); | ^~~~~~~~~~~~ In file included from ldap_api_fn.c:33: /home/sk/tmp/sdk/openwrt-sdk-ath79-generic_gcc-11.2.0_musl.Linux-x86_64/staging_dir/target-mips_24kc_musl/usr/include/ldap.h:1555:1: note: previous declaration of 'ldap_connect' with type 'int(LDAP *)' {aka 'int(struct ldap *)'} 1555 | ldap_connect( LDAP *ld ); | ^~~~~~~~~~~~ make[5]: *** [../../Makefile.rules:100: ldap_api_fn.o] Error 1 make[4]: *** [Makefile:511: modules] Error 1 [1] https://github.com/curl/curl/commit/8bdde6b14ce3b5fd71c772a578fcbd4b6fa6df19 Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> (cherry picked from commit 362c6de08058948d0a70a1eeb14ec718f922b4e5) (cherry picked from commit 65e50fbd24f9239a4dab25c6b8328670e150fda5) - URL: https://github.com/kamailio/kamailio/commit/be9d186983862cae606311ec200227b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:57:48+01:00 siputils: docs - note about restrictions of ring_insert_callid() - GH #2989 (cherry picked from commit 090f1f74603de6113f3dd41095ae41b4f03f8171) (cherry picked from commit e0084adcda85b10b3b0c0765a292cfde088b2845) - URL: https://github.com/kamailio/kamailio/commit/7529d73430ec34b0a5ed260a8a7d6fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:58:00+01:00 core: parser sdp - print hdr name by length on error in get_sdp_hdr_field() (cherry picked from commit c4e462fa6bda38ac6fd814ce8d98ea030d4049b9) (cherry picked from commit 0aa4340764f78c74a62054050d8805616f450fdb) - URL: https://github.com/kamailio/kamailio/commit/48abb7e5465552817b652884b44f4e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:58:49+01:00 presence: utils - use memcpy instead of strncpy for coherence (cherry picked from commit 33c40170e73adc71e2ad66d8dbb6c776b771ce5d) (cherry picked from commit e3ed8c0d80dea4da4c522864f1480d02d57e2d4a) - URL: https://github.com/kamailio/kamailio/commit/9b809ec448fc9e8487ec3543af80171… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:59:00+01:00 lcr: init buffers to try to get rid of new warnings (cherry picked from commit 0247c336e208912324c71aea9843e688d7c5a463) (cherry picked from commit 7381ccd61a325e5b6502d05588ac8edf9a244d0f) - URL: https://github.com/kamailio/kamailio/commit/bdcb7be3ee190dd89df84d1436e9309… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:59:12+01:00 dispatcher: safety checks for str fields (cherry picked from commit 5443db4d632c8502dc622cc28fe2847fb0c147c1) (cherry picked from commit e855d251d27e5a399cfa3d8a70b4387295c37c6e) - URL: https://github.com/kamailio/kamailio/commit/4c9ff2f8c7ea3ab700b74e1407fc048… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:59:25+01:00 rls: free xml doc in case of error (cherry picked from commit 55f23d09faee06a892dde13e371d144b98bae68f) (cherry picked from commit 93cd99f08c61b7355e948dfbf855eb381e84ed1b) - URL: https://github.com/kamailio/kamailio/commit/4c0b3bd5277905be9fbddd1afa2c517… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:59:37+01:00 avpops: init variable to fix warning (cherry picked from commit b7815d04ced35d5b5ccbcdaa39d41ef4a2cb2ad0) (cherry picked from commit 4f002432bf2699d99f7b83a3652fc9e2b6c7447d) - URL: https://github.com/kamailio/kamailio/commit/b9b058fc4ddb5a2f21eb87fa293a39c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T12:59:48+01:00 db_text: init variable to fix warning (cherry picked from commit 102b7c62ae9877151ce542b8b5747051fb954acb) (cherry picked from commit c8582892d0cacbd2ed857f87d2fa59ae7ae10148) - URL: https://github.com/kamailio/kamailio/commit/e2c5c607c48f1c5443320e708f19f16… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:00:00+01:00 dialog: init variable to fix warning (cherry picked from commit 682f9984fc4942d5f786f0ca9d798630d618f8da) (cherry picked from commit 49d5f6eb5f9f0a800dbaaf02c3ef8ef6622a6b73) - URL: https://github.com/kamailio/kamailio/commit/016febcb8c4a2de4d21201d0f2f74ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:00:16+01:00 core: parser - print ascii code and position of invalid char for identity info (cherry picked from commit 40e59d9c3b8ec531cb9e26093c43647a43108dfd) (cherry picked from commit ef9b353910d10d91fde88193b7a3dd9c27bf18ad) - URL: https://github.com/kamailio/kamailio/commit/f2591185cc40e41b5b5f8470f608493… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:00:30+01:00 dispatcher: removed module name from log message - updates to debug messages (cherry picked from commit 29ebde9cfe746c1dd9083a5fc4b26a32c39ca0a4) (cherry picked from commit c8d579452906aee0c2716ef9ac25fe0d4628089e) - URL: https://github.com/kamailio/kamailio/commit/caa6f373820d76d6bda8e65b18bb5e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:00:42+01:00 tm: update uri when refreshing local uac shortcuts (cherry picked from commit 0ed1282238da6cdd8a4dbef1b61493b70a850a6b) (cherry picked from commit 633148323c83b9f35d221ff59fbf7b3be8194b1f) - URL: https://github.com/kamailio/kamailio/commit/0a99d2059fa0e6530f78493a36bcf19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:00:54+01:00 db_unixodbc: catch queries without result to skip printing error logs - GH #2810 (cherry picked from commit 795a09077ccc5dd06f9074978dc77dd81389512b) (cherry picked from commit 3d4ceff9aa77b841fa2df938cfbab9b534f14626) - URL: https://github.com/kamailio/kamailio/commit/dc8b1cde73a854e5a8f265c0b9c8fbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:01:06+01:00 stats: detect of mod param items is set after track - it can lead to crash if items is set to greater value than the default one (GH #2101) - round up for better memory alignment in the allocated structures (cherry picked from commit b29c79c8d83fd23064e50dcee02e5f85ec51328d) (cherry picked from commit 331e60374e6a0c283b835ab62da84826c8833a48) - URL: https://github.com/kamailio/kamailio/commit/967607b3c2711d33801bab21110283e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:01:16+01:00 statsc: note that items param must be set before track (cherry picked from commit f517f8c655e676f5872eda5f81f5244eac4eed25) (cherry picked from commit 38bdf24485f3e4d2d9489ba695f7b23bbce85cc0) - URL: https://github.com/kamailio/kamailio/commit/6685bb996094547d8955ce69bd018d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:01:28+01:00 core: set exit flag for return 0 (cherry picked from commit 23c39ecbdd29f2fff0af4a693b08032e8afff48b) (cherry picked from commit b149906e3c0558fd9cb866d39b36f180efaef656) - URL: https://github.com/kamailio/kamailio/commit/f5d9eabb7e859a6fb0c6506e2969328… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-03-02T13:01:38+01:00 phonenum: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules; - removed predefined CXX and LD variables. (cherry picked from commit c4b280bd5b5b0cfb8d34ecef296972f2a043791e) (cherry picked from commit 3ee8896e87a8a2b0f6e704d806983b544a0a5224) - URL: https://github.com/kamailio/kamailio/commit/0afb5767a8af925b514528ab46d8f53… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-03-02T13:01:50+01:00 websocket: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. (cherry picked from commit 0a3476384b325514b1da784b74cc821360193409) (cherry picked from commit 0ee717c91ca0dc590d6764803c151982a4d12d4a) - URL: https://github.com/kamailio/kamailio/commit/cefee1b4f0be02d31849b01e8abf837… Author: drTr0jan <drtr0jan(a)yandex.ru> Date: 2022-03-02T13:02:00+01:00 rtp_media_server: Makefile - support for FreeBSD build - updated LIBS and DEFS variables, making them consistent with the rest of modules. (cherry picked from commit cda05478b25ad93b1fb7475cf6b2767d7164bbbb) (cherry picked from commit d40337449e274f6c6d9ea1754977287841c306c9) - URL: https://github.com/kamailio/kamailio/commit/12cac22b3a12384ca98d27def01f632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:02:19+01:00 websocket: makefile - set library path for localbase (cherry picked from commit 2e4258f440a07a2cfd20082af22bba4f9a2448ab) (cherry picked from commit 254d19b4dd703c24a7a15e5539e585e42b3de101) - URL: https://github.com/kamailio/kamailio/commit/11303aa0728e993372ff54a52ee2f74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:02:31+01:00 Makefile.defs: set localbase for macports on macos (cherry picked from commit 584eabf7de6af9f835678f9c6d6851cce49a3878) (cherry picked from commit a18374d1f0c5ec58e92981e4ac14320de7de92d9) - URL: https://github.com/kamailio/kamailio/commit/3d609391c367acc11f49b40d6b0bacb… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-03-02T13:03:02+01:00 rls: fixed format-truncation warning GH #3013 (cherry picked from commit e921fc8ed7a6c9fdeb532179a77503cd67799487) (cherry picked from commit 86c897fac37d2a78b8122b4c62ec87a2371fd9d4) - URL: https://github.com/kamailio/kamailio/commit/e8706eda78b2b36dde82a94af469acf… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-03-02T13:03:12+01:00 presence: fixed format-truncation warning GH #3013 (cherry picked from commit c1b14f49ead9a29711cde5334155819cd1c6c90d) (cherry picked from commit 5d05de900de0145a22a5bf044267d9b0c0ceb712) - URL: https://github.com/kamailio/kamailio/commit/3096fdcb1ab96fc70a2bc19013b9d3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:03:37+01:00 xhttp_pi: wrap freeing and setting to null in curly braces - GH #3012 (cherry picked from commit 37580a25694d5e5b0b4c89a92d1ba2d8b77aacba) (cherry picked from commit 56d9073ef2dd61f6ab48602fe2af77e3c090e290) - URL: https://github.com/kamailio/kamailio/commit/42813328a803becc03658329462326a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:03:48+01:00 db_perlvdb: removed unnecessary condition (cherry picked from commit d3daed0a617024fde1efabbcdab27dc4c5c140c8) (cherry picked from commit 10cfb3ea0e80cfbaa5745093d471a58997a633ff) - URL: https://github.com/kamailio/kamailio/commit/c73e94ec8ad3c22be89f524f327116a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:03:58+01:00 ims_dialog: updated test conditions - GH #3014 (cherry picked from commit a8d56242da48708949149c11c06d031b5c2fad49) (cherry picked from commit 6c3b7c0e2ee3e0d397f1781f385eb78483fdd67f) - URL: https://github.com/kamailio/kamailio/commit/852404c2ccb6d1056371c19ffb81cee… Author: Adrian Bunk <bunk(a)debian.org> Date: 2022-03-02T13:04:13+01:00 src/Makefile: Also stop compiling kamcmd from here (cherry picked from commit c1335157c53ca014bbeec6de312f42d955221d58) (cherry picked from commit 43b94264f81e54625ee90faa7f52b006b67a1b61) - URL: https://github.com/kamailio/kamailio/commit/4c20bfabe36b1a6019e62f1b1134198… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:04:26+01:00 core: updated description for core.psa rpc command (cherry picked from commit aca381d30413eb1b43abf9e7e3b1306854ceb117) (cherry picked from commit 19cef203a1b487174ce7a0e66431b2c03bf78c65) - URL: https://github.com/kamailio/kamailio/commit/03a8ad0e184d2be501698757b7a7efa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:04:37+01:00 xmlops: docs - more practical example for xml_ns (cherry picked from commit 0cb6a0640e9e3e2e06d2c5bc68c6177d5bd38b89) (cherry picked from commit 207e0d9f80b2e1a48c7c21844f158e231bfd8e1e) - URL: https://github.com/kamailio/kamailio/commit/f672aae895a53d2584009ad1618ed1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:04:49+01:00 xmlops: docs - added the remark that xml_ns param can be set many times (cherry picked from commit 56e26387b77536e6c9f13dd62e5aecabaaba2d9a) (cherry picked from commit 78710d9da5cfe117190694cd3b77ced54414a2e8) - URL: https://github.com/kamailio/kamailio/commit/fd33fa9381e74289fd8f093a4d9b0ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:05:43+01:00 uuid: use define for buffer size - log error if uuid was not generated in safe mode (cherry picked from commit e81f2e318bc32802d152ef69d005b8194e17ca42) (cherry picked from commit 42d4359e6c3288fdfb705c5d0e38f47443048550) - URL: https://github.com/kamailio/kamailio/commit/8145a3a06d078b3c3c3b921da96a4f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:06:03+01:00 siputils: handle messages with many headers for contact param encode/decode (cherry picked from commit cf054e0e041385d0533d0fa7b49e34fc1131ddcb) (cherry picked from commit cfe2dce135550054cec3ff86501c9265209ffad5) - URL: https://github.com/kamailio/kamailio/commit/068861f80aa0d4f911b9d66a945cb47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:06:11+01:00 siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate - GH #3042 (cherry picked from commit e3b9521a150ac2245dee2afeac5d674768c7399a) (cherry picked from commit 39e6c357a93a62033082a3bed2f985b8ad47db13) - URL: https://github.com/kamailio/kamailio/commit/f2fb024d8928c291bf2b943f2346b0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:06:34+01:00 tmx: use trimmed call-id value for hashing (cherry picked from commit 88f1a1a671c4486e5000415b3d52eb42e6ad4cbb) (cherry picked from commit 11e7c173f2974c2174d1ccaca717eb63c5608a84) - URL: https://github.com/kamailio/kamailio/commit/d003c87289243c5380e5fa0dce27ea9… Author: Matthias Urlichs <matthias(a)urlichs.de> Date: 2022-03-02T13:06:48+01:00 nathelper: Fix uninitialized data - the IP checksum is part of the header and must be zeroed before checksumming - also silence another (benign) warning (cherry picked from commit 7cbbd8fb22ac0d57a5dd3883dee185b3bc0601e2) (cherry picked from commit e77e4ad4953aac413d06ceb3954736b81ac30355) - URL: https://github.com/kamailio/kamailio/commit/d475ee121cb0f6ff71146f8ce108a46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:07:13+01:00 core: fixed comment typo (cherry picked from commit c37ccdc6e3bad0af4644941a872f510c51936c58) (cherry picked from commit 42b80a2cf0fa1b2e7192ade5844df670a49480ff) - URL: https://github.com/kamailio/kamailio/commit/2e0caef3c77e7cc7f3b766228b48e8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T13:13:52+01:00 Revert "siputils: handle messages with many headers for contact param encode/decode" This reverts commit 8145a3a06d078b3c3c3b921da96a4f2e000ea9b7.

1 0

git:5.5:42b80a2c: core: fixed comment typo
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 42b80a2cf0fa1b2e7192ade5844df670a49480ff URL: https://github.com/kamailio/kamailio/commit/42b80a2cf0fa1b2e7192ade5844df67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:15:05+01:00 core: fixed comment typo (cherry picked from commit c37ccdc6e3bad0af4644941a872f510c51936c58) --- Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/42b80a2cf0fa1b2e7192ade5844df67… Patch: https://github.com/kamailio/kamailio/commit/42b80a2cf0fa1b2e7192ade5844df67… --- diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 99c1dc1de1..df47e18965 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -154,7 +154,7 @@ typedef int (*param_func_t)( modparam_t type, void* val); @warning child_init(PROC_MAIN) is again called in the same process (main), but latter (before tcp), so make sure you don't init things - twice, bot in PROC_MAIN and PROC_INT */ + twice, both in PROC_MAIN and PROC_INT */ #define PROC_NOCHLDINIT -128 /**< no child init functions will be called if this rank is used in fork_process() */

1 0

git:5.5:0a945faa: blst: converted log macros and removed function names
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 0a945faa496a48377c766f5966243b3e0a9dbc75 URL: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:52+01:00 blst: converted log macros and removed function names (cherry picked from commit f85cd7eb9d3249ee93f0de7f978d0a9e7044df77) --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… Patch: https://github.com/kamailio/kamailio/commit/0a945faa496a48377c766f5966243b3… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 5d33368bd8..1c2773c53c 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -119,11 +119,10 @@ static int ki_blst_add(sip_msg_t* msg, int t) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -193,12 +192,10 @@ static int ki_blst_add_retry_after(sip_msg_t* msg, int t_min, int t_max) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -241,11 +238,10 @@ static int ki_blst_del(sip_msg_t* msg) if (dst_blocklist_del(&src, msg)) return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -281,8 +277,7 @@ static int ki_blst_is_blocklisted(sip_msg_t* msg) " blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_is_blocklisted:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -309,8 +304,7 @@ static int ki_blst_set_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -349,8 +343,7 @@ static int ki_blst_clear_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -390,8 +383,7 @@ static int ki_blst_rpl_set_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -432,8 +424,7 @@ static int ki_blst_rpl_clear_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; }

1 0

git:5.5:b8329204: Erlang: Revert breaking change
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: b83292042aae87c445e05c3f82231ca6d335cc96 URL: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:11+01:00 Erlang: Revert breaking change Revert https://github.com/kamailio/kamailio/commit/6542a367638ec5f8a2b62994f8c309e… xavp_add_xavp_value returns the root and not the xavp it added and that was the reason for the code the commit removed. Changed a variable name to help make that more clear. Also related to https://github.com/kamailio/kamailio/issues/2069. (cherry picked from commit 1ed58f0de4f7a3ab3a81dd84c1c3b94fa1df2c4b) --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… Patch: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… --- diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index 894c36784c..b19a22ac8e 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -86,11 +86,15 @@ sr_xavp_t *xbuff_new(str *name) if(!xbuffs_root) { - xbuff = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); - } else { - xbuff = xavp_get_child(&xbuff_list, name); + xbuffs_root = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); + if (!xbuffs_root){ + LM_ERR("cannot create xbuffs_root \n"); + return NULL; + } } + xbuff = xavp_get_child(&xbuff_list, name); + if (!xbuff) { xbuff_val.type = SR_XTYPE_NULL;

1 0

git:5.5:e77e4ad4: nathelper: Fix uninitialized data
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: e77e4ad4953aac413d06ceb3954736b81ac30355 URL: https://github.com/kamailio/kamailio/commit/e77e4ad4953aac413d06ceb3954736b… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:38+01:00 nathelper: Fix uninitialized data - the IP checksum is part of the header and must be zeroed before checksumming - also silence another (benign) warning (cherry picked from commit 7cbbd8fb22ac0d57a5dd3883dee185b3bc0601e2) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/e77e4ad4953aac413d06ceb3954736b… Patch: https://github.com/kamailio/kamailio/commit/e77e4ad4953aac413d06ceb3954736b… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 9e45a61079..3cb138ebdd 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1615,7 +1615,7 @@ static inline int replace_sdp_ip( { str body1, oldip, newip; str body = *org_body; - int pf, pf1 = 0; + int pf = 0, pf1 = 0; str body2; char *bodylimit = body.s + body.len; int ret; @@ -1974,6 +1974,7 @@ static int send_raw(const char *buf, int buf_len, union sockaddr_union *to, ip->ip_off = 0; ip->ip_ttl = 69; ip->ip_p = 17; + ip->ip_sum = 0; ip->ip_src.s_addr = s_ip; ip->ip_dst.s_addr = to->sin.sin_addr.s_addr;

1 0

git:5.5:11e7c173: tmx: use trimmed call-id value for hashing
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 11e7c173f2974c2174d1ccaca717eb63c5608a84 URL: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:13:19+01:00 tmx: use trimmed call-id value for hashing (cherry picked from commit 88f1a1a671c4486e5000415b3d52eb42e6ad4cbb) --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… Patch: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 256c82bf16..7bb2315fd3 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -243,7 +243,7 @@ int tmx_check_pretran(sip_msg_t *msg) sftag = get_from(msg)->tag_value; trim(&sftag); - chid = get_hash1_raw(msg->callid->body.s, msg->callid->body.len); + chid = get_hash1_raw(scallid.s, scallid.len); slotid = chid & (_tmx_ptran_size-1); if(unlikely(_tmx_proc_ptran == NULL)) {

1 0

git:5.5:34eceee6: Erlang: Erlang module assumes pvi.type is zero
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 34eceee62f20dfd4ef148277c93391e5e778ccef URL: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:01+01:00 Erlang: Erlang module assumes pvi.type is zero Related to this commit: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… (cherry picked from commit fa74be53232d56797209a630823a20346f9d2597) --- Modified: src/modules/erlang/pv_atom.c Modified: src/modules/erlang/pv_pid.c Modified: src/modules/erlang/pv_ref.c Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… Patch: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… --- diff --git a/src/modules/erlang/pv_atom.c b/src/modules/erlang/pv_atom.c index b37f01560f..092672751c 100644 --- a/src/modules/erlang/pv_atom.c +++ b/src/modules/erlang/pv_atom.c @@ -51,6 +51,9 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_pid.c b/src/modules/erlang/pv_pid.c index 2de3f5e698..acb2bee5b2 100644 --- a/src/modules/erlang/pv_pid.c +++ b/src/modules/erlang/pv_pid.c @@ -54,6 +54,9 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_ref.c b/src/modules/erlang/pv_ref.c index 052f7ced90..927cb4b855 100644 --- a/src/modules/erlang/pv_ref.c +++ b/src/modules/erlang/pv_ref.c @@ -54,6 +54,9 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index ce6e2bd2eb..894c36784c 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -198,6 +198,9 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break;

1 0

git:5.5:39e6c357: siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: 5.5 Commit: 39e6c357a93a62033082a3bed2f985b8ad47db13 URL: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T09:33:52+01:00 siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate - GH #3042 (cherry picked from commit e3b9521a150ac2245dee2afeac5d674768c7399a) --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… Patch: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 63fdd5c6cb..31d7f716ca 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -349,7 +349,7 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) } } - if(msg_send(pdst, buf, len) < 0) { + if(msg_send_buffer(pdst, buf, len, 1) < 0) { LM_ERR("cannot send duplicate message\n"); goto error; }

1 0

git:master:e3b9521a: siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate
by Daniel-Constantin Mierla 02 Mar '22

02 Mar '22

Module: kamailio Branch: master Commit: e3b9521a150ac2245dee2afeac5d674768c7399a URL: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T09:29:06+01:00 siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate - GH #3042 --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… Patch: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 63fdd5c6cb..31d7f716ca 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -349,7 +349,7 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) } } - if(msg_send(pdst, buf, len) < 0) { + if(msg_send_buffer(pdst, buf, len, 1) < 0) { LM_ERR("cannot send duplicate message\n"); goto error; }

1 0

git:master:3dc980d6: modules: readme files regenerated - jwt ... [skip ci]
by Kamailio Dev 02 Mar '22

02 Mar '22

Module: kamailio Branch: master Commit: 3dc980d66fc4caeea90bb95870394c8855b51dec URL: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-02T08:46:19+01:00 modules: readme files regenerated - jwt ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8… Patch: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8…

1 0

git:master:eee5068e: jwt: add missing tag in doc
by Victor Seva 02 Mar '22

02 Mar '22

Module: kamailio Branch: master Commit: eee5068e2f315b6d391e6fe7b6aef4875afcf574 URL: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-02T08:39:26+01:00 jwt: add missing tag in doc error instroduced at aaa142d293105ef27f7e4b6143fc3fb18c9a5a75 --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… Patch: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index 45d98c7689..a72c518efe 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -115,6 +115,7 @@ modparam("jwt", "key_mode", 1) added as string value. </para> </listitem> + <listitem> <para> headers - the list of headers to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters format).

1 0

git:master:9d1f223c: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 01 Mar '22

01 Mar '22

Module: kamailio Branch: master Commit: 9d1f223c7705a7ed8d888f50f2611dea1649ffa5 URL: https://github.com/kamailio/kamailio/commit/9d1f223c7705a7ed8d888f50f2611de… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-01T14:01:17+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/9d1f223c7705a7ed8d888f50f2611de… Patch: https://github.com/kamailio/kamailio/commit/9d1f223c7705a7ed8d888f50f2611de… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index d1721ffa84..dc28b471ec 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -249,10 +249,13 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") The format of the value follows the SIP params style: "attr1=val1;attr2=val2;...". The attributes can be: - * type - it can be "A" (IPv4) or "AAAA" (IPv6) + * type - it can be "A" (IPv4), "AAAA" (IPv6) or "SRV" * name - the domain name * addr - the IP address * ttl - TTL value + * priority - priority value for SRV record + * weight - weight value for SRV record + * port - port value for SRV record * flags - can be: 1 - the domain is unresolvable (like blocklisted); 2 - the record is permanent (never times out, never deleted, never overwritten)

1 0

git:master:23c8ba29: corex: support adding dns srv records via dns_cache param
by Daniel-Constantin Mierla 01 Mar '22

01 Mar '22

Module: kamailio Branch: master Commit: 23c8ba29ac4cd0ccbc3012e87e48f289bfb9d200 URL: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-01T13:45:54+01:00 corex: support adding dns srv records via dns_cache param --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… Patch: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index b4e0b67a87..b2fc9c09b2 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -383,6 +383,10 @@ static int corex_dns_cache_param_add(str *pval) unsigned short dns_type = 0; int dns_ttl = 0; int dns_flags = 0; + int dns_priority = 0; + int dns_weight = 0; + int dns_port = 0; + if(pval==NULL) { LM_ERR("invalid parameter\n"); @@ -414,8 +418,11 @@ static int corex_dns_cache_param_add(str *pval) || (pit->body.s[0]=='A'))) { dns_type = T_A; } else if((pit->body.len == 4) - && strncasecmp(pit->name.s, "aaaa", 4)==0) { + && strncasecmp(pit->body.s, "aaaa", 4)==0) { dns_type = T_AAAA; + } else if((pit->body.len == 3) + && strncasecmp(pit->body.s, "srv", 3)==0) { + dns_type = T_SRV; } } else if(pit->name.len==3 && strncasecmp(pit->name.s, "ttl", 3)==0) { @@ -433,6 +440,30 @@ static int corex_dns_cache_param_add(str *pval) return -1; } } + } else if(pit->name.len==8 + && strncasecmp(pit->name.s, "priority", 8)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_priority) < 0) { + LM_ERR("invalid priority: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } else if(pit->name.len==6 + && strncasecmp(pit->name.s, "weight", 6)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_weight) < 0) { + LM_ERR("invalid weight: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } else if(pit->name.len==4 + && strncasecmp(pit->name.s, "port", 4)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_port) < 0) { + LM_ERR("invalid port: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } } } @@ -440,9 +471,9 @@ static int corex_dns_cache_param_add(str *pval) &dns_name, dns_ttl, &dns_addr, - 0 /* priority */, - 0 /* weight */, - 0 /* port */, + dns_priority, /* priority */ + dns_weight, /* weight */ + dns_port, /* port */ dns_flags) == 0) { return 0; }

1 0

git:master:c9d682fa: corex: docs extended for dns_cache parameter
by Daniel-Constantin Mierla 01 Mar '22

01 Mar '22

Module: kamailio Branch: master Commit: c9d682fa7fb52357c2ca3779b1d23d1d151f065a URL: https://github.com/kamailio/kamailio/commit/c9d682fa7fb52357c2ca3779b1d23d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-01T13:48:29+01:00 corex: docs extended for dns_cache parameter --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c9d682fa7fb52357c2ca3779b1d23d1… Patch: https://github.com/kamailio/kamailio/commit/c9d682fa7fb52357c2ca3779b1d23d1… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 5ae9bea44a..6a1b94e021 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -109,7 +109,7 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") <itemizedlist> <listitem> <para> - <emphasis>type</emphasis> - it can be "A" (IPv4) or "AAAA" (IPv6) + <emphasis>type</emphasis> - it can be "A" (IPv4), "AAAA" (IPv6) or "SRV" </para> </listitem> <listitem> @@ -127,6 +127,21 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") <emphasis>ttl</emphasis> - TTL value </para> </listitem> + <listitem> + <para> + <emphasis>priority</emphasis> - priority value for SRV record + </para> + </listitem> + <listitem> + <para> + <emphasis>weight</emphasis> - weight value for SRV record + </para> + </listitem> + <listitem> + <para> + <emphasis>port</emphasis> - port value for SRV record + </para> + </listitem> <listitem> <para> <emphasis>flags</emphasis> - can be: 1 - the domain is unresolvable

1 0

git:master:78c8d084: db_redis: clean previous connection before trying to reconnect
by Victor Seva 01 Mar '22

01 Mar '22

Module: kamailio Branch: master Commit: 78c8d084e30373aacc456fd41062b68e6e82ea6f URL: https://github.com/kamailio/kamailio/commit/78c8d084e30373aacc456fd41062b68… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-01T10:35:23+01:00 db_redis: clean previous connection before trying to reconnect --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/78c8d084e30373aacc456fd41062b68… Patch: https://github.com/kamailio/kamailio/commit/78c8d084e30373aacc456fd41062b68… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 1166117961..5cf36ffb36 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -124,6 +124,11 @@ int db_redis_connect(km_redis_con_t *con) { #endif reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

1 0

[kamailio/kamailio] add duk_module_node to module app_jsdt (PR #3038)
by Ian Carlson 01 Mar '22

01 Mar '22

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #3037 #### Description I can not remember the last time I wrote any C which was likely a class assignment last century. Anyways I came across this issue and it seemed in reach to get the ball rolling. I know this PR needs more work but my goal is to share my progress to help move this feature forward. Based on https://github.com/svaarala/duktape/tree/master/extras/module-node added: - duk_module_node.h - duk_module_node.c updated: - app_jsdt_api.h - app_jsdt_api.c Included the extra header and initialize the bindings after 'load JS context' was created. added `cb_resolve_module` to resolve the full file system path for requested_id and parent_id added `cb_load_module` function which uses `jsdt_load_file` to load resolved file With absolute and relative modules working I met my current requirements to allow breaking routing into multiple smaller files. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3038 -- Commit Summary -- * app_jsdt: add duk_module_node for JS module resolution -- File Changes -- M src/modules/app_jsdt/app_jsdt_api.c (65) M src/modules/app_jsdt/app_jsdt_api.h (3) A src/modules/app_jsdt/duk_module_node.c (333) A src/modules/app_jsdt/duk_module_node.h (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3038.patch https://github.com/kamailio/kamailio/pull/3038.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3038 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3038(a)github.com>

2 4

git:5.5:cfe2dce1: siputils: handle messages with many headers for contact param encode/decode
by Daniel-Constantin Mierla 28 Feb '22

28 Feb '22

Module: kamailio Branch: 5.5 Commit: cfe2dce135550054cec3ff86501c9265209ffad5 URL: https://github.com/kamailio/kamailio/commit/cfe2dce135550054cec3ff86501c926… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-28T14:55:44+01:00 siputils: handle messages with many headers for contact param encode/decode (cherry picked from commit cf054e0e041385d0533d0fa7b49e34fc1131ddcb) --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/cfe2dce135550054cec3ff86501c926… Patch: https://github.com/kamailio/kamailio/commit/cfe2dce135550054cec3ff86501c926…

1 0

git:master:cf054e0e: siputils: handle messages with many headers for contact param encode/decode
by Daniel-Constantin Mierla 28 Feb '22

28 Feb '22

Module: kamailio Branch: master Commit: cf054e0e041385d0533d0fa7b49e34fc1131ddcb URL: https://github.com/kamailio/kamailio/commit/cf054e0e041385d0533d0fa7b49e34f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-28T14:54:21+01:00 siputils: handle messages with many headers for contact param encode/decode --- Modified: src/modules/siputils/contact_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/cf054e0e041385d0533d0fa7b49e34f… Patch: https://github.com/kamailio/kamailio/commit/cf054e0e041385d0533d0fa7b49e34f…

1 0

[kamailio/kamailio] core: improve SDP parser to support ICE media stream options / improve existing data structures cloning in the SDP parser (PR #3034)
by Donat Zenichev 28 Feb '22

28 Feb '22

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [X] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Commits are separated per change dedication, even though they concern the same component. - core: add support of ICE media options to SDP parser - core: improve an existing data structures cloning in the SDP parser --- core: add support of ICE media options to SDP parser In the current implementation only parsing of ICE candidate attributes is supported, which makes it Possible to work with ICE candidates and parameters specifically related per candidate, but makes it Impossible to work with ICE options of the media stream level (ICE options which have an impact on the whole specific media stream). ICE candidate attributes and ICE media options have different dedication. In order to target this matter, a new linked list is introduced to store ICE media stream options. Additionally, now when parsing media stream's attributes, a couple of new helper functions have been introduced to properly extract and store ICE media options: - extract_ice_option() - add_sdp_ice_opt() The following extraction approaches are supported: - multi-valued ICE options attribute (more than one value per a= header) - one value per attribute (multiple a= headers with ICE options present) Also now the way how a "zeroed" on-hold is detected is improved, in case of the ICE (re)negotiation (when the connection address is equal to '0.0.0.0', the media port is equal to '9' and ice-option 'trickle' is present) the SDP is Not considered as an on-hold case, and it clearly detects it's the ICE (re)negotiation (RFC 8840), which for e.g. leads to a proper work of other side modules' functions (which use SDP parser's data structures), such as 'is_audio_on_hold()' from the textops.so module. --- core: improve existing data structures cloning in the SDP parser It's been noticed that the cloning of SDP session(s) and SDP stream(s) structures doesn't allocate the ICE candidate attributes, nor it allocates (recently introduced) ICE media stream options. In order to target this a couple of new functions have been introduced: - clone_sdp_opt_attr() - clone_sdp_ice_attr() And additionally the following functions have been improved, in order to properly clone/free ICE candidate attributes and (recently introduced) ICE media stream options: - clone_sdp_stream_cell() - free_cloned_sdp_stream() - free_sdp() - print_sdp_stream() Additionally for a proper new structure length calculation, the following function is fixed: - clone_sdp_session_cell() --- Tagging project members to review the changes: @miconda @henningw @linuxmaniac You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3034 -- Commit Summary -- * core: add support of ICE media options to SDP parser * core: improve an existing data structures cloning in the SDP parser -- File Changes -- M src/core/parser/sdp/sdp.c (290) M src/core/parser/sdp/sdp.h (40) M src/core/parser/sdp/sdp_helpr_funcs.c (60) M src/core/parser/sdp/sdp_helpr_funcs.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3034.patch https://github.com/kamailio/kamailio/pull/3034.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3034 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3034(a)github.com>

3 2

git:master:236fada4: core: add support of ICE media options to SDP parser
by Victor Seva 28 Feb '22

28 Feb '22

Module: kamailio Branch: master Commit: 236fada43f610b910490f7e0c216ac9aa3d9480c URL: https://github.com/kamailio/kamailio/commit/236fada43f610b910490f7e0c216ac9… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-28T09:13:21+01:00 core: add support of ICE media options to SDP parser In the current implementation only parsing of ICE candidate attributes is supported, which makes it Possible to work with ICE candidates and parameters specifically related per candidate, but makes it Impossible to work with ICE options of the media stream level (ICE options which have an impact on the whole specific media stream). ICE candidate attributes and ICE media options have different dedication. In order to target this matter, a new linked list is introduced to store ICE media stream options. Additionally, now when parsing media stream's attributes, a couple of new helper functions have been introduced to properly extract and store ICE media options: - extract_ice_option() - add_sdp_ice_opt() The following extraction approaches are supported: - multi-valued ICE options attribute (more than one value per a= header) - one value per attribute (multiple a= headers with ICE options present) Also now the way how a "zeroed" on-hold is detected is improved, in case of the ICE (re)negotiation (when the connection address is equal to '0.0.0.0', the media port is equal to '9' and ice-option 'trickle' is present) the SDP is Not considered as an on-hold case, and it clearly detects it's the ICE (re)negotiation (RFC 8840), which for e.g. leads to a proper work of other side modules' functions (which use SDP parser's data structures), such as 'is_audio_on_hold()' from the textops.so module. --- Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp.h Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/parser/sdp/sdp_helpr_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/236fada43f610b910490f7e0c216ac9… Patch: https://github.com/kamailio/kamailio/commit/236fada43f610b910490f7e0c216ac9…

1 0

git:master:fe7d7c57: core: improve an existing data structures cloning in the SDP parser
by Victor Seva 28 Feb '22

28 Feb '22

Module: kamailio Branch: master Commit: fe7d7c571b6c8d446cf66a1cf27d335d98f5f945 URL: https://github.com/kamailio/kamailio/commit/fe7d7c571b6c8d446cf66a1cf27d335… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-28T09:13:21+01:00 core: improve an existing data structures cloning in the SDP parser It's been noticed that the cloning of SDP session(s) and SDP stream(s) structures doesn't allocate the ICE candidate attributes, nor it allocates (recently introduced) ICE media stream options. In order to target this a couple of new functions have been introduced: - clone_sdp_opt_attr() - clone_sdp_ice_attr() And additionally the following functions have been improved, in order to properly clone/free ICE candidate attributes and (recently introduced) ICE media stream options: - clone_sdp_stream_cell() - free_cloned_sdp_stream() - free_sdp() - print_sdp_stream() Additionally for a proper new structure length calculation, the following function is fixed: - clone_sdp_session_cell() --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/fe7d7c571b6c8d446cf66a1cf27d335… Patch: https://github.com/kamailio/kamailio/commit/fe7d7c571b6c8d446cf66a1cf27d335…

1 0

git:master:cc4ac5c4: pkg/kamailio/deb: fix backports rules related to nats
by Victor Seva 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: cc4ac5c4b8133f435438bb322457eef7a8a642cf URL: https://github.com/kamailio/kamailio/commit/cc4ac5c4b8133f435438bb322457eef… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-25T16:19:51+01:00 pkg/kamailio/deb: fix backports rules related to nats --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/bullseye Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/cc4ac5c4b8133f435438bb322457eef… Patch: https://github.com/kamailio/kamailio/commit/cc4ac5c4b8133f435438bb322457eef…

1 0

[kamailio/kamailio] pkg::deb: Missing spaces (PR #3041)
by Matthias Urlichs 25 Feb '22

25 Feb '22

fixes the deleted space after "erlang" introduced by a593f518dd62fd68c330eb42470ce5d5e1dce636   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3041 -- Commit Summary -- * pkg::deb: Missing spaces -- File Changes -- M pkg/kamailio/deb/bionic/rules (2) M pkg/kamailio/deb/bullseye/rules (2) M pkg/kamailio/deb/buster/rules (2) M pkg/kamailio/deb/focal/rules (2) M pkg/kamailio/deb/jessie/rules (2) M pkg/kamailio/deb/stretch/rules (2) M pkg/kamailio/deb/trusty/rules (2) M pkg/kamailio/deb/xenial/rules (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3041.patch https://github.com/kamailio/kamailio/pull/3041.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3041 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3041(a)github.com>

2 3

git:master:21efa40a: pkg::deb: Missing spaces
by Henning Westerholt 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: 21efa40ab781d3dffb271fbb3def0a9d12bf8a17 URL: https://github.com/kamailio/kamailio/commit/21efa40ab781d3dffb271fbb3def0a9… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-02-25T15:49:57+01:00 pkg::deb: Missing spaces fixes the deleted space after "erlang" introduced by a593f518dd62fd68c330eb42470ce5d5e1dce636 --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/21efa40ab781d3dffb271fbb3def0a9… Patch: https://github.com/kamailio/kamailio/commit/21efa40ab781d3dffb271fbb3def0a9…

1 0

[kamailio/kamailio] KEMI jsdt CommonJS-based module support (Issue #3037)
by Ian Carlson 25 Feb '22

25 Feb '22

### Description Kamailio uses Ducktape 2 without module-node or module-ducktape, requiring all routing in a single file. https://wiki.duktape.org/howtomodules I'm attempting to add module-node support and creating this issue to track with PR. Response from mailing list > Hello, > > I didn't notice that require() was not in the duktape 2.x, I will try to add support for module-duktape when I get a chance. If someone wants to do it, pull requests are welcome -- it does not seem to be complex: > * https://github.com/svaarala/duktape/tree/master/extras/module-duktape > The module-node sounds interesting, but not being familiar with node.js, looks it need more work to enable it: > * https://github.com/svaarala/duktape/tree/master/extras/module-node > > Cheers, > Daniel ### Expected behavior Include the required() JS file ` var test = require('./test'); ` #### Actual observed behavior Calling require() in a JSDT script throws TypeError: undefined not callable #### Log Messages ``` ERROR: app_jsdt [app_jsdt_api.c:448]: jsdt_kemi_load_script(): failed running: TypeError: undefined not callable ``` ### Possible Solutions I played around a little with `module-duktape` but wasn't smart enough to define a `Duktape.modSearch()` that would work as desired. I'm probably missing something obvious. I've recently been playing with `asterisk/node-ari-client` which got me curious if `module-node` might be more aligned with thinking. ### Additional Information * **Kamailio Version** - kamailio 5.5.4 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3037 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3037(a)github.com>

2 2

git:master:5ac41325: modules: readme files regenerated - app_jsdt ... [skip ci]
by Kamailio Dev 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: 5ac41325edcc323684bae5bfc8bd1c4617571553 URL: https://github.com/kamailio/kamailio/commit/5ac41325edcc323684bae5bfc8bd1c4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-25T09:46:16+01:00 modules: readme files regenerated - app_jsdt ... [skip ci] --- Modified: src/modules/app_jsdt/README --- Diff: https://github.com/kamailio/kamailio/commit/5ac41325edcc323684bae5bfc8bd1c4… Patch: https://github.com/kamailio/kamailio/commit/5ac41325edcc323684bae5bfc8bd1c4… --- diff --git a/src/modules/app_jsdt/README b/src/modules/app_jsdt/README index 4186cced58..dc8c13bda8 100644 --- a/src/modules/app_jsdt/README +++ b/src/modules/app_jsdt/README @@ -26,6 +26,7 @@ Daniel-Constantin Mierla 3. Parameters 3.1. load (str) + 3.2. mode (int) 4. Functions @@ -44,10 +45,11 @@ Daniel-Constantin Mierla List of Examples 1.1. Set load parameter - 1.2. jsdt_dofile usage - 1.3. jsdt_dostring usage - 1.4. jsdt_run usage - 1.5. jsdt_runstring usage + 1.2. Set mode parameter + 1.3. jsdt_dofile usage + 1.4. jsdt_dostring usage + 1.5. jsdt_run usage + 1.6. jsdt_runstring usage Chapter 1. Admin Guide @@ -62,6 +64,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. load (str) + 3.2. mode (int) 4. Functions @@ -119,6 +122,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. load (str) + 3.2. mode (int) 3.1. load (str) @@ -134,6 +138,18 @@ Chapter 1. Admin Guide modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") ... +3.2. mode (int) + + Control if the API to load JavaScript module (nodejs interface) is + initialized or not. + + Default value is “1” (initialize). + + Example 1.2. Set mode parameter +... +modparam("app_jsdt", "mode", 0) +... + 4. Functions 4.1. jsdt_dofile(path) @@ -146,7 +162,7 @@ modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") Execute the JavaScript script stored in 'path'. The parameter can be a string with pseudo-variables evaluated at runtime. - Example 1.2. jsdt_dofile usage + Example 1.3. jsdt_dofile usage ... jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js"); ... @@ -156,7 +172,7 @@ jsdt_dofile("/usr/local/etc/kamailio/js/myscript.js"); Execute the JavaScript script stored in parameter. The parameter can be a string with pseudo-variables. - Example 1.3. jsdt_dostring usage + Example 1.4. jsdt_dostring usage ... if(!jsdt_dostring('KSR.dbg("test message\n")')) { @@ -171,7 +187,7 @@ if(!jsdt_dostring('KSR.dbg("test message\n")')) loaded at startup via parameter 'load'. Parameters can be strings with pseudo-variables that are evaluated at runtime. - Example 1.4. jsdt_run usage + Example 1.5. jsdt_run usage ... if(!jsdt_run("js_append_fu_to_reply")) { @@ -187,7 +203,7 @@ jsdt_run("js_funcx", "$rU", "2"); string with pseudo-variables. The script is executed in JS context specific to loaded JS files at startup. - Example 1.5. jsdt_runstring usage + Example 1.6. jsdt_runstring usage ... if(!jsdt_runstring('KSR.dbg("Hello World from $fU\n")')) {

1 0

git:master:0bc30ab5: app_jsdt: docs for mode parameter
by Daniel-Constantin Mierla 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: 0bc30ab5b54a9450552a968bdcdff8f39830733b URL: https://github.com/kamailio/kamailio/commit/0bc30ab5b54a9450552a968bdcdff8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-25T09:36:19+01:00 app_jsdt: docs for mode parameter --- Modified: src/modules/app_jsdt/doc/app_jsdt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0bc30ab5b54a9450552a968bdcdff8f… Patch: https://github.com/kamailio/kamailio/commit/0bc30ab5b54a9450552a968bdcdff8f… --- diff --git a/src/modules/app_jsdt/doc/app_jsdt_admin.xml b/src/modules/app_jsdt/doc/app_jsdt_admin.xml index d4fd89d377..4c3a746b9b 100644 --- a/src/modules/app_jsdt/doc/app_jsdt_admin.xml +++ b/src/modules/app_jsdt/doc/app_jsdt_admin.xml @@ -17,7 +17,7 @@ <section> <title>Overview</title> <para> - This module allows executing JavaScript scripts from the Kamailio + This module allows executing JavaScript scripts from the Kamailio configuration file. It exports all KEMI functions to JavaScript in order to access the currently processed SIP message. These functions are named within @@ -107,7 +107,26 @@ modparam("app_jsdt", "load", "/usr/local/etc/kamailio/js/myscript.js") </programlisting> </example> </section> - + <section id="app_jsdt.p.mode"> + <title><varname>mode</varname> (int)</title> + <para> + Control if the API to load JavaScript module (nodejs interface) is + initialized or not. + </para> + <para> + <emphasis> + Default value is <quote>1</quote> (initialize). + </emphasis> + </para> + <example> + <title>Set <varname>mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_jsdt", "mode", 0) +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:f7509533: app_jsdt: added parameter mode to control initialization of js module api
by Daniel-Constantin Mierla 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: f7509533685129a87f411e395eb87c07935b969d URL: https://github.com/kamailio/kamailio/commit/f7509533685129a87f411e395eb87c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-25T09:29:09+01:00 app_jsdt: added parameter mode to control initialization of js module api --- Modified: src/modules/app_jsdt/app_jsdt_api.c Modified: src/modules/app_jsdt/app_jsdt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f7509533685129a87f411e395eb87c0… Patch: https://github.com/kamailio/kamailio/commit/f7509533685129a87f411e395eb87c0… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index a3c1026a3a..b1ded049fc 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -54,6 +54,7 @@ typedef struct _sr_jsdt_env static sr_jsdt_env_t _sr_J_env = {0}; str _sr_jsdt_load_file = STR_NULL; +int _sr_jsdt_mode = 1; static int *_sr_jsdt_reload_version = NULL; static int _sr_jsdt_local_version = 0; @@ -471,12 +472,14 @@ int jsdt_sr_init_child(int rank) LM_ERR("cannot create load JS context (load)\n"); return -1; } - duk_push_object(_sr_J_env.JJ); - duk_push_c_function(_sr_J_env.JJ, cb_resolve_module, DUK_VARARGS); - duk_put_prop_string(_sr_J_env.JJ, -2, "resolve"); - duk_push_c_function(_sr_J_env.JJ, cb_load_module, DUK_VARARGS); - duk_put_prop_string(_sr_J_env.JJ, -2, "load"); - duk_module_node_init(_sr_J_env.JJ); + if(_sr_jsdt_mode == 1) { + duk_push_object(_sr_J_env.JJ); + duk_push_c_function(_sr_J_env.JJ, cb_resolve_module, DUK_VARARGS); + duk_put_prop_string(_sr_J_env.JJ, -2, "resolve"); + duk_push_c_function(_sr_J_env.JJ, cb_load_module, DUK_VARARGS); + duk_put_prop_string(_sr_J_env.JJ, -2, "load"); + duk_module_node_init(_sr_J_env.JJ); + } jsdt_sr_kemi_register_libs(_sr_J_env.JJ); LM_DBG("loading js script file: %.*s\n", _sr_jsdt_load_file.len, _sr_jsdt_load_file.s); diff --git a/src/modules/app_jsdt/app_jsdt_mod.c b/src/modules/app_jsdt/app_jsdt_mod.c index 526376a1d5..1328c3069b 100644 --- a/src/modules/app_jsdt/app_jsdt_mod.c +++ b/src/modules/app_jsdt/app_jsdt_mod.c @@ -56,6 +56,7 @@ static int w_app_jsdt_run3(sip_msg_t *msg, char *func, char *p1, char *p2, static int fixup_jsdt_run(void** param, int param_no); extern str _sr_jsdt_load_file; +extern int _sr_jsdt_mode; /* clang-format off */ static cmd_export_t cmds[]={ @@ -79,6 +80,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"load", PARAM_STR, &_sr_jsdt_load_file}, + {"mode", PARAM_INT, &_sr_jsdt_mode}, {0, 0, 0} };

1 0

git:master:c37ccdc6: core: fixed comment typo
by Daniel-Constantin Mierla 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: c37ccdc6e3bad0af4644941a872f510c51936c58 URL: https://github.com/kamailio/kamailio/commit/c37ccdc6e3bad0af4644941a872f510… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-25T09:13:46+01:00 core: fixed comment typo --- Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/c37ccdc6e3bad0af4644941a872f510… Patch: https://github.com/kamailio/kamailio/commit/c37ccdc6e3bad0af4644941a872f510… --- diff --git a/src/core/sr_module.h b/src/core/sr_module.h index 33f4f00095..251be938b0 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -160,7 +160,7 @@ void ksr_module_set_flag(unsigned int flag); @warning child_init(PROC_MAIN) is again called in the same process (main), but latter (before tcp), so make sure you don't init things - twice, bot in PROC_MAIN and PROC_INT */ + twice, both in PROC_MAIN and PROC_INT */ #define PROC_NOCHLDINIT -128 /**< no child init functions will be called if this rank is used in fork_process() */

1 0

git:master:3c1851ad: app_jsdt: skip child init for proc_init rank
by Daniel-Constantin Mierla 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: 3c1851ad546f574d1fda869348c8f7e5186079d2 URL: https://github.com/kamailio/kamailio/commit/3c1851ad546f574d1fda869348c8f7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-25T09:13:08+01:00 app_jsdt: skip child init for proc_init rank --- Modified: src/modules/app_jsdt/app_jsdt_api.c Modified: src/modules/app_jsdt/app_jsdt_api.h Modified: src/modules/app_jsdt/app_jsdt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3c1851ad546f574d1fda869348c8f7e… Patch: https://github.com/kamailio/kamailio/commit/3c1851ad546f574d1fda869348c8f7e… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 9d4711cc6f..a3c1026a3a 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -456,7 +456,7 @@ int jsdt_kemi_load_script(void) /** * */ -int jsdt_sr_init_child(void) +int jsdt_sr_init_child(int rank) { memset(&_sr_J_env, 0, sizeof(sr_jsdt_env_t)); _sr_J_env.J = duk_create_heap_default(); @@ -1692,4 +1692,4 @@ duk_ret_t cb_load_module(duk_context *JJ) { return duk_generic_error(JJ, "Could not load module '%s'", resolved_id); } return 1; /*nrets*/ -} \ No newline at end of file +} diff --git a/src/modules/app_jsdt/app_jsdt_api.h b/src/modules/app_jsdt/app_jsdt_api.h index 4b0f1ca169..a03d1e6ddf 100644 --- a/src/modules/app_jsdt/app_jsdt_api.h +++ b/src/modules/app_jsdt/app_jsdt_api.h @@ -27,7 +27,7 @@ #include "duktape.h" int jsdt_sr_init_mod(void); -int jsdt_sr_init_child(void); +int jsdt_sr_init_child(int rank); void jsdt_sr_destroy(void); int jsdt_sr_initialized(void); diff --git a/src/modules/app_jsdt/app_jsdt_mod.c b/src/modules/app_jsdt/app_jsdt_mod.c index 4245d2e77c..526376a1d5 100644 --- a/src/modules/app_jsdt/app_jsdt_mod.c +++ b/src/modules/app_jsdt/app_jsdt_mod.c @@ -117,7 +117,10 @@ static int mod_init(void) */ static int child_init(int rank) { - return jsdt_sr_init_child(); + if(rank==PROC_INIT) { + return 0; + } + return jsdt_sr_init_child(rank); } /**

1 0

git:master:4a2415e3: app_jsdt: add duk_module_node for JS module resolution
by Daniel-Constantin Mierla 25 Feb '22

25 Feb '22

Module: kamailio Branch: master Commit: 4a2415e33ea75bb103da3561312f7b850c4aedf6 URL: https://github.com/kamailio/kamailio/commit/4a2415e33ea75bb103da3561312f7b8… Author: Ian Carlson <ian(a)xantek.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-25T08:38:40+01:00 app_jsdt: add duk_module_node for JS module resolution - reported by GH #3037 - cb_resolve_module: resolves absolute and relative paths resolves absolute if request_id starts with a / if parent_id then resolved relative path based parent_id path if no parent_id resolves relative path based on app_jsdt load file path request_id without /, ./, or ../ are not resolved and return error - cb_load_module: use jsdt_load_file to load resolved file - see: https://github.com/svaarala/duktape/tree/master/extras/module-node --- Added: src/modules/app_jsdt/duk_module_node.c Added: src/modules/app_jsdt/duk_module_node.h Modified: src/modules/app_jsdt/app_jsdt_api.c Modified: src/modules/app_jsdt/app_jsdt_api.h --- Diff: https://github.com/kamailio/kamailio/commit/4a2415e33ea75bb103da3561312f7b8… Patch: https://github.com/kamailio/kamailio/commit/4a2415e33ea75bb103da3561312f7b8…

1 0

Info: SIP resources collection
by Daniel-Constantin Mierla 24 Feb '22

24 Feb '22

Hello, over the 20 years I used various SIP applications, libraries and tools but after a while I forgot many of them, therefore I tried to collect many in a list hosted on github at: * https://github.com/miconda/sip-resources Hoping it proves useful for some of you! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Feb 21-24, 2022 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

3 4

[kamailio/kamailio] segmentation fault on kamailio 5.4.4 (Issue #3039)
by descartin 24 Feb '22

24 Feb '22

hello all we have seen a segmentation fault on a kamailio 5.4.4 ``` #0 0x00007feb664346ad in print_lists (dlg=0x7feaa5f65290) at dlg_var.c:277 277 varlist = varlist->next; Missing separate debuginfos, use: debuginfo-install bzip2-libs-1.0.6-13.el7.x86_64 cyrus-sasl-lib-2.1.26-20.el7_2.x86_64 elfutils-libelf-0.166-2.el7.x86_64 elfutils-libs-0.166-2.el7.x86_64 glibc-2.17-157.el7_3.5.x86_64 jansson-2.10-1.el7.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-8.el7.x86_64 libattr-2.4.46-12.el7.x86_64 libcap-2.22-8.el7.x86_64 libcom_err-1.42.9-9.el7.x86_64 libcurl-7.29.0-35.el7.centos.x86_64 libev-4.15-7.el7.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-16.el7.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-6.el7.x86_64 libssh2-1.4.3-10.el7_2.1.x86_64 libuuid-2.23.2-33.el7_3.2.x86_64 libxml2-2.9.1-6.el7_2.3.x86_64 nspr-4.13.1-1.0.el7_3.x86_64 nss-3.28.4-1.2.el7_3.x86_64 nss-softokn-freebl-3.16.2.3-14.4.el7.x86_64 nss-util-3.28.4-1.0.el7_3.x86_64 openldap-2.4.40-13.el7.x86_64 openssl-libs-1.0.2k-19.el7.x86_64 pcre-8.32-15.el7_2.1.x86_64 systemd-libs-219-30.el7_3.9.x86_64 xz-libs-5.2.2-1.el7.x86_64 zlib-1.2.7-17.el7.x86_64 (gdb) bt #0 0x00007feb664346ad in print_lists (dlg=0x7feaa5f65290) at dlg_var.c:277 #1 0x00007feb664367ff in pv_set_dlg_variable (msg=0x7feb6a881bd8, param=0x7feb6adc85a0, op=254, val=0x7ffea166a7a0) at dlg_var.c:443 #2 0x00000000004bbaf2 in lval_pvar_assign (h=0x7ffea166bbd0, msg=0x7feb6a881bd8, lv=0x7feb6adc8668, rv=0x7feb6adc87e8) at core/lvalue.c:352 #3 0x00000000004bc5f0 in lval_assign (h=0x7ffea166bbd0, msg=0x7feb6a881bd8, lv=0x7feb6adc8668, rve=0x7feb6adc87e0) at core/lvalue.c:400 #4 0x0000000000487ddf in do_action (h=0x7ffea166bbd0, a=0x7feb6adc8f80, msg=0x7feb6a881bd8) at core/action.c:1455 #5 0x0000000000489b1b in run_actions (h=0x7ffea166bbd0, a=0x7feb6adc8338, msg=0x7feb6a881bd8) at core/action.c:1581 #6 0x000000000047c6d7 in do_action (h=0x7ffea166bbd0, a=0x7feb6adce4c0, msg=0x7feb6a881bd8) at core/action.c:1067 #7 0x0000000000489b1b in run_actions (h=0x7ffea166bbd0, a=0x7feb6adc3190, msg=0x7feb6a881bd8) at core/action.c:1581 #8 0x000000000048a25f in run_top_route (a=0x7feb6adc3190, msg=0x7feb6a881bd8, c=0x7ffea166bbd0) at core/action.c:1666 #9 0x00007feb69eab0a2 in reply_received (p_msg=0x7feb6a881bd8) at t_reply.c:2543 #10 0x000000000059dc77 in do_forward_reply (msg=0x7feb6a881bd8, mode=0) at core/forward.c:764 #11 0x000000000059f949 in forward_reply (msg=0x7feb6a881bd8) at core/forward.c:865 #12 0x00000000005f095a in receive_msg ( buf=0xacec80 <buf.7134> "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 79.170.70.13;branch=z9hG4bK7837.ffc6315fbd54de1e6a00b32fa1cc0eda.1\r\nVia: SIP/2.0/UDP 79.170.66.28:5080;received=79.170.66.28;rport=5080;branch=z9hG4bK83ve3c7ty27QF"..., len=426, rcv_info=0x7ffea166c6c0) at core/receive.c:509 #13 0x00000000004e3cd7 in udp_rcv_loop () at core/udp_server.c:543 #14 0x0000000000429f56 in main_loop () at main.c:1689 #15 0x0000000000434034 in main (argc=15, argv=0x7ffea166cf58) at main.c:2876 ``` [Uploading core_kamailio_mia_osp_feb18.log…]() could you please take a look to the attached full backtrace? thanks a lot and regards david -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3039 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3039(a)github.com>

2 2

git:master:f85cd7eb: blst: converted log macros and removed function names
by Daniel-Constantin Mierla 24 Feb '22

24 Feb '22

Module: kamailio Branch: master Commit: f85cd7eb9d3249ee93f0de7f978d0a9e7044df77 URL: https://github.com/kamailio/kamailio/commit/f85cd7eb9d3249ee93f0de7f978d0a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-24T14:12:44+01:00 blst: converted log macros and removed function names --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/f85cd7eb9d3249ee93f0de7f978d0a9… Patch: https://github.com/kamailio/kamailio/commit/f85cd7eb9d3249ee93f0de7f978d0a9… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index 5d33368bd8..1c2773c53c 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -119,11 +119,10 @@ static int ki_blst_add(sip_msg_t* msg, int t) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -193,12 +192,10 @@ static int ki_blst_add_retry_after(sip_msg_t* msg, int t_min, int t_max) S_TO_TICKS(t)); return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_add_retry_after:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -241,11 +238,10 @@ static int ki_blst_del(sip_msg_t* msg) if (dst_blocklist_del(&src, msg)) return 1; }else{ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support disabled\n"); + LM_WARN("blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_del: blocklist support not compiled-in" - " - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -281,8 +277,7 @@ static int ki_blst_is_blocklisted(sip_msg_t* msg) " blocklist support disabled\n"); } #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_is_blocklisted:" - " blocklist support not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return -1; } @@ -309,8 +304,7 @@ static int ki_blst_set_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -349,8 +343,7 @@ static int ki_blst_clear_ignore(sip_msg_t* msg, int mask) msg->fwd_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -390,8 +383,7 @@ static int ki_blst_rpl_set_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask|=blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; } @@ -432,8 +424,7 @@ static int ki_blst_rpl_clear_ignore(sip_msg_t* msg, int mask) msg->rpl_send_flags.blst_imask&=~blst_imask; return 1; #else /* USE_DST_BLOCKLIST */ - LOG(L_WARN, "WARNING: blst: blst_ignore_req: blocklist support" - " not compiled-in - no effect -\n"); + LM_WARN("blocklist support not compiled-in - no effect -\n"); #endif /* USE_DST_BLOCKLIST */ return 1; }

1 0

git:master:a63fde36: pkg/kamailio/deb: add kamailio-nats-modules to bookworm
by Victor Seva 24 Feb '22

24 Feb '22

Module: kamailio Branch: master Commit: a63fde36f440b6d79cea6cdb0dfeee6258d96698 URL: https://github.com/kamailio/kamailio/commit/a63fde36f440b6d79cea6cdb0dfeee6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-23T14:25:46+01:00 pkg/kamailio/deb: add kamailio-nats-modules to bookworm https://tracker.debian.org/news/1305763/natsc-320-1-migrated-to-testing/ --- Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/debian/backports/bookworm --- Diff: https://github.com/kamailio/kamailio/commit/a63fde36f440b6d79cea6cdb0dfeee6… Patch: https://github.com/kamailio/kamailio/commit/a63fde36f440b6d79cea6cdb0dfeee6… --- diff --git a/pkg/kamailio/deb/bookworm/control b/pkg/kamailio/deb/bookworm/control index 8f425be82c..4e670a602c 100644 --- a/pkg/kamailio/deb/bookworm/control +++ b/pkg/kamailio/deb/bookworm/control @@ -29,6 +29,7 @@ Build-Depends: libmongoc-dev, libmono-2.0-dev [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x], libmosquitto-dev, + libnats-dev, libncurses5-dev, libpcre3-dev, libperl-dev, @@ -840,6 +841,24 @@ Description: Libwebsockets module for the Kamailio SIP server This package contains the lwcs module, which provides a client-side WebSockets API through libwebsockets. +Package: kamailio-nats-modules +Architecture: any +Multi-Arch: same +Pre-Depends: + ${misc:Pre-Depends}, +Depends: + kamailio (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Description: Nats module for the Kamailio SIP server + Kamailio is a very fast and flexible SIP (RFC3261) + server. Written entirely in C, Kamailio can handle thousands calls + per second even on low-budget hardware. + . + This package contains the nats module, which provides a NATS consumer for Kamailio. + NATS is a real time distributed messaging platform, more details about it can be + found at nats.io. + Package: kamailio-extra-modules Architecture: any Multi-Arch: same diff --git a/pkg/kamailio/deb/bookworm/rules b/pkg/kamailio/deb/bookworm/rules index ddf8846c9d..2161ac0bb4 100755 --- a/pkg/kamailio/deb/bookworm/rules +++ b/pkg/kamailio/deb/bookworm/rules @@ -21,7 +21,7 @@ include /usr/share/dpkg/buildflags.mk export RADCLI=1 # modules not in the "main" kamailio package -EXCLUDED_MODULES= java python nats +EXCLUDED_MODULES= java python # extra modules to skip, because they are not compilable now # - regardless if they go to the main kamailio package or to some module package, @@ -37,7 +37,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ snmpstats carrierroute xmpp cpl redisgeoip geoip2 \ sqlite json mono ruby ims sctp \ tls outbound websocket autheph kazoo cnxcc \ - erlangsystemd phonenum mongodb rabbitmq python3 mqtt secsipid lwsc + erlang nats systemd phonenum mongodb rabbitmq python3 mqtt secsipid lwsc # module groups to be packaged onto kamailio-extra-modules EXTRA_GROUPS=gzcompress uuid ev jansson http_async diff --git a/pkg/kamailio/deb/debian/backports/bookworm b/pkg/kamailio/deb/debian/backports/bookworm index 21dafb2d11..1d39bd6509 100755 --- a/pkg/kamailio/deb/debian/backports/bookworm +++ b/pkg/kamailio/deb/debian/backports/bookworm @@ -35,13 +35,6 @@ sed -i -e '/^ python,/d' -e '/python-dev/d' \ sed -i -e 's/ python [ ,$]*//' ${DIST}/rules sed -i -e '/^EXCLUDED_MODULES=/s/$/ python/' ${DIST}/rules -# no libnats-dev -sed -i -e '/^ libnats-dev,/d' \ - -e '/^Package: kamailio-nats-modules/,/^$/d' \ - ${DIST}/control -sed -i -e 's/ nats [ ,$]*//' ${DIST}/rules -sed -i -e '/^EXCLUDED_MODULES=/s/$/ nats/' ${DIST}/rules - wrap-and-sort -sat -d ${DIST} # clean backports scripts

2 2

[kamailio/kamailio] db_redis: cluster support (Issue #2977)
by Riccardo-78 23 Feb '22

23 Feb '22

### Description At the moment db_redis driver does not support interfacing with a redis cluster. This is a proposal to add support to it. The db_redis module will get a new module parameter to enable cluster support (with default 0 - disabled): ``` modparam("db_redis", "cluster", 1) ``` The redis url used by other modules needs to specify all nodes in the cluster, and must NOT include redis database number (since it's not supported in cluster mode): ``` #!define DBURL_USRLOC "redis://10.0.1.1:6379,10.0.1.2:6379,10.0.1.3:6379" ``` The implementation is going to use the [hiredis-cluster](https://github.com/Nordix/hiredis-cluster) library (BSD license). If cluster mode is not enabled the module will behave like before, i.e. all calls to redis will use hiredis library directly. If you find this proposal sensible, I'll start coding it. Feedback is welcome, of course! -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2977 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/2977(a)github.com>

3 5

[kamailio/kamailio] nathelper: uninitialized data (PR #3035)
by Matthias Urlichs 23 Feb '22

23 Feb '22

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The IP checksum is part of the header and must be zeroed before checksumming. This patch also silences another (benign) warning. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3035 -- Commit Summary -- * nathelper: Fix uninitialized data -- File Changes -- M src/modules/nathelper/nathelper.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3035.patch https://github.com/kamailio/kamailio/pull/3035.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3035 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3035(a)github.com>

2 2

git:master:7cbbd8fb: nathelper: Fix uninitialized data
by Daniel-Constantin Mierla 23 Feb '22

23 Feb '22

Module: kamailio Branch: master Commit: 7cbbd8fb22ac0d57a5dd3883dee185b3bc0601e2 URL: https://github.com/kamailio/kamailio/commit/7cbbd8fb22ac0d57a5dd3883dee185b… Author: Matthias Urlichs <matthias(a)urlichs.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-23T08:56:24+01:00 nathelper: Fix uninitialized data - the IP checksum is part of the header and must be zeroed before checksumming - also silence another (benign) warning --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/7cbbd8fb22ac0d57a5dd3883dee185b… Patch: https://github.com/kamailio/kamailio/commit/7cbbd8fb22ac0d57a5dd3883dee185b… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 22e128ac9c..cd657a7071 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1786,7 +1786,7 @@ static inline int replace_sdp_ip( { str body1, oldip, newip; str body = *org_body; - int pf, pf1 = 0; + int pf = 0, pf1 = 0; str body2; char *bodylimit = body.s + body.len; int ret; @@ -2145,6 +2145,7 @@ static int send_raw(const char *buf, int buf_len, union sockaddr_union *to, ip->ip_off = 0; ip->ip_ttl = 69; ip->ip_p = 17; + ip->ip_sum = 0; ip->ip_src.s_addr = s_ip; ip->ip_dst.s_addr = to->sin.sin_addr.s_addr;

1 0

[kamailio/kamailio] ims_ipsec_pcscf: fix issues with UEs not sending certain replies thro… (PR #3029)
by kristiyan-peychev-flolive 21 Feb '22

21 Feb '22

…ugh the ipsec tunnel   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I've fixed an issue that would ignore legitimate replies that are sent by real-world UEs, causing calls to completely break due to timeouts. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3029 -- Commit Summary -- * ims_ipsec_pcscf: fix issues with UEs not sending certain replies through the ipsec tunnel -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (108) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (13) M src/modules/ims_ipsec_pcscf/ipsec.c (39) D src/modules/ims_ipsec_pcscf/port_gen.c (227) D src/modules/ims_ipsec_pcscf/port_gen.h (41) M src/modules/ims_ipsec_pcscf/sec_agree.c (26) M src/modules/ims_ipsec_pcscf/spi_gen.c (119) M src/modules/ims_ipsec_pcscf/spi_gen.h (6) M src/modules/ims_ipsec_pcscf/spi_list.c (72) M src/modules/ims_ipsec_pcscf/spi_list.h (13) M src/modules/ims_ipsec_pcscf/spi_list_tests.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3029.patch https://github.com/kamailio/kamailio/pull/3029.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3029 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3029(a)github.com>

4 10

[kamailio/kamailio] ims: fix a crash with contact parsing (PR #3032)
by kristiyan-peychev-flolive 21 Feb '22

21 Feb '22

When running as a P-CSCF a crash would occur with certain in-dialog replies. The `msg->contact->parsed` pointer is unreliably reused and would point to garbage.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When running as a P-CSCF a crash would occur with certain in-dialog replies. The `msg->contact->parsed` pointer is unreliably reused and would point to garbage. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3032 -- Commit Summary -- * ims: fix a crash with contact parsing -- File Changes -- M src/lib/ims/ims_getters.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3032.patch https://github.com/kamailio/kamailio/pull/3032.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3032 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3032(a)github.com>

3 6

git:master:84898be4: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 21 Feb '22

21 Feb '22

Module: kamailio Branch: master Commit: 84898be41740624ceb03a2f135683c880f5f95e0 URL: https://github.com/kamailio/kamailio/commit/84898be41740624ceb03a2f135683c8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-21T12:46:21+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/84898be41740624ceb03a2f135683c8… Patch: https://github.com/kamailio/kamailio/commit/84898be41740624ceb03a2f135683c8…

1 0

git:master:d5b09279: async: docs - fixed mismatching tags
by Daniel-Constantin Mierla 21 Feb '22

21 Feb '22

Module: kamailio Branch: master Commit: d5b0927983b308d36e512f0134b0aef015f22f89 URL: https://github.com/kamailio/kamailio/commit/d5b0927983b308d36e512f0134b0aef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-21T12:34:20+01:00 async: docs - fixed mismatching tags --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d5b0927983b308d36e512f0134b0aef… Patch: https://github.com/kamailio/kamailio/commit/d5b0927983b308d36e512f0134b0aef… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 7185cbff52..126da999ec 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -111,8 +111,6 @@ modparam("async", "ms_timer", 10) </programlisting> </example> </section> - <section> - <title>Parameters</title> <section id="async.p.return"> <title><varname>return</varname> (int)</title> <para>

1 0

[kamailio/kamailio] Erlang: Fixes to get the module functional again (PR #3024)
by James Van Vleet 18 Feb '22

18 Feb '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2069 #### Description The Erlang module is not working at all with newer Kamailio versions. One of the issues was already found in #2069 but no code was submitted. The second one I believe is related to https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… in that the erlang module assumes that pvi.type is zero and uses that field to type the custom fields it manages and this commit starts populating pvi.type with a 4. I don't have a solid grasp on pvapi.c so if the experts have a better way to fix this up I am all ears. These two commits do get the module working properly and I am able to use both the custom erlang PV terms and the RPC feature from my proxy now. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3024 -- Commit Summary -- * Erlang: Erlang module assumes pvi.type is zero * Erlang: Revert breaking change -- File Changes -- M src/modules/erlang/pv_atom.c (3) M src/modules/erlang/pv_pid.c (3) M src/modules/erlang/pv_ref.c (3) M src/modules/erlang/pv_xbuff.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3024.patch https://github.com/kamailio/kamailio/pull/3024.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3024 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3024(a)github.com>

2 2

git:master:1ed58f0d: Erlang: Revert breaking change
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: 1ed58f0de4f7a3ab3a81dd84c1c3b94fa1df2c4b URL: https://github.com/kamailio/kamailio/commit/1ed58f0de4f7a3ab3a81dd84c1c3b94… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T15:40:04+01:00 Erlang: Revert breaking change Revert https://github.com/kamailio/kamailio/commit/6542a367638ec5f8a2b62994f8c309e… xavp_add_xavp_value returns the root and not the xavp it added and that was the reason for the code the commit removed. Changed a variable name to help make that more clear. Also related to https://github.com/kamailio/kamailio/issues/2069. --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/1ed58f0de4f7a3ab3a81dd84c1c3b94… Patch: https://github.com/kamailio/kamailio/commit/1ed58f0de4f7a3ab3a81dd84c1c3b94… --- diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index 894c36784c..b19a22ac8e 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -86,11 +86,15 @@ sr_xavp_t *xbuff_new(str *name) if(!xbuffs_root) { - xbuff = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); - } else { - xbuff = xavp_get_child(&xbuff_list, name); + xbuffs_root = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); + if (!xbuffs_root){ + LM_ERR("cannot create xbuffs_root \n"); + return NULL; + } } + xbuff = xavp_get_child(&xbuff_list, name); + if (!xbuff) { xbuff_val.type = SR_XTYPE_NULL;

1 0

git:master:fa74be53: Erlang: Erlang module assumes pvi.type is zero
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: fa74be53232d56797209a630823a20346f9d2597 URL: https://github.com/kamailio/kamailio/commit/fa74be53232d56797209a630823a203… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T15:40:04+01:00 Erlang: Erlang module assumes pvi.type is zero Related to this commit: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… --- Modified: src/modules/erlang/pv_atom.c Modified: src/modules/erlang/pv_pid.c Modified: src/modules/erlang/pv_ref.c Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/fa74be53232d56797209a630823a203… Patch: https://github.com/kamailio/kamailio/commit/fa74be53232d56797209a630823a203… --- diff --git a/src/modules/erlang/pv_atom.c b/src/modules/erlang/pv_atom.c index b37f01560f..092672751c 100644 --- a/src/modules/erlang/pv_atom.c +++ b/src/modules/erlang/pv_atom.c @@ -51,6 +51,9 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_pid.c b/src/modules/erlang/pv_pid.c index 2de3f5e698..acb2bee5b2 100644 --- a/src/modules/erlang/pv_pid.c +++ b/src/modules/erlang/pv_pid.c @@ -54,6 +54,9 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_ref.c b/src/modules/erlang/pv_ref.c index 052f7ced90..927cb4b855 100644 --- a/src/modules/erlang/pv_ref.c +++ b/src/modules/erlang/pv_ref.c @@ -54,6 +54,9 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index ce6e2bd2eb..894c36784c 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -198,6 +198,9 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break;

1 0

git:master:02367309: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: 0236730941b6cdd80009de40daeef5f095cc1d58 URL: https://github.com/kamailio/kamailio/commit/0236730941b6cdd80009de40daeef5f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-18T09:16:20+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/0236730941b6cdd80009de40daeef5f… Patch: https://github.com/kamailio/kamailio/commit/0236730941b6cdd80009de40daeef5f…

1 0

git:master:29035b39: async: module parameter to set return code on success
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: 29035b39707a94436d24a4a8dce9c36632d4ec78 URL: https://github.com/kamailio/kamailio/commit/29035b39707a94436d24a4a8dce9c36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T09:04:27+01:00 async: module parameter to set return code on success - more flexibility to exit or not config file execution --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/29035b39707a94436d24a4a8dce9c36… Patch: https://github.com/kamailio/kamailio/commit/29035b39707a94436d24a4a8dce9c36… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index ee69e96e14..3b18eda957 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -42,6 +42,7 @@ MODULE_VERSION static int async_workers = 1; static int async_ms_timer = 0; +static int async_return = 0; static int mod_init(void); static int child_init(int); @@ -89,6 +90,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"workers", INT_PARAM, &async_workers}, {"ms_timer", INT_PARAM, &async_ms_timer}, + {"return", INT_PARAM, &async_return}, {0, 0, 0} }; @@ -231,7 +233,7 @@ static int w_async_sleep(sip_msg_t *msg, char *sec, char *str2) if(async_sleep(msg, s, ap->u.paction->next, NULL) < 0) return -1; /* force exit in config */ - return 0; + return async_return; } return -1; @@ -271,7 +273,7 @@ static int w_async_ms_sleep(sip_msg_t *msg, char *sec, char *str2) if(async_ms_sleep(msg, s, ap->u.paction->next, NULL) < 0) return -1; /* force exit in config */ - return 0; + return async_return; } return -1; @@ -334,7 +336,7 @@ int ki_async_route(sip_msg_t *msg, str *rn, int s) if(async_sleep(msg, s, act, rn) < 0) return -1; /* force exit in config */ - return 0; + return async_return; } /** @@ -370,7 +372,7 @@ int ki_async_ms_route(sip_msg_t *msg, str *rn, int s) if(async_ms_sleep(msg, s, act, rn) < 0) return -1; /* force exit in config */ - return 0; + return async_return; } /** @@ -478,7 +480,7 @@ int ki_async_task_group_route(sip_msg_t *msg, str *rn, str *gn) if(async_send_task(msg, act, rn, gn) < 0) return -1; /* force exit in config */ - return 0; + return async_return; } /**

1 0

git:master:73321a9a: async: docs for return parameter
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: 73321a9a56e3772852c3254cc1936cb17d0a635d URL: https://github.com/kamailio/kamailio/commit/73321a9a56e3772852c3254cc1936cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T09:04:27+01:00 async: docs for return parameter --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/73321a9a56e3772852c3254cc1936cb… Patch: https://github.com/kamailio/kamailio/commit/73321a9a56e3772852c3254cc1936cb… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index b0e5ec45bd..4955f00036 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -108,6 +108,29 @@ modparam("async", "workers", 2) ... modparam("async", "ms_timer", 10) ... +</programlisting> + </example> + </section> + <section> + <title>Parameters</title> + <section id="async.p.return"> + <title><varname>return</varname> (int)</title> + <para> + The value to be returned by async functions on success. It does + not apply for async data functions, only for those that suspend + the SIP transaction. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>workers</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("async", "return", 1) +... </programlisting> </example> </section>

1 0

git:master:537d1118: async: docs - fixed typos
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: 537d11183d4907101e69d00e92e3530d2eb7cb5e URL: https://github.com/kamailio/kamailio/commit/537d11183d4907101e69d00e92e3530… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T09:04:27+01:00 async: docs - fixed typos --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/537d11183d4907101e69d00e92e3530… Patch: https://github.com/kamailio/kamailio/commit/537d11183d4907101e69d00e92e3530… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 4955f00036..7185cbff52 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -93,9 +93,9 @@ modparam("async", "workers", 2) <para> Enables millisecond timer for async_ms_sleep() and async_ms_route() functions. The integer value is the timer resolution in milliseconds. A smaller timer - resultion will generate a higher load on the system. If you set ms_timer - to 1 you will get a timer with 1 millisecond resultion, a setting of 20 - provides a resultion of 20ms. + resolution will generate a higher load on the system. If you set ms_timer + to 1 you will get a timer with 1 millisecond resolution, a setting of 20 + provides a resolution of 20ms. </para> <para> <emphasis>

1 0

git:master:ac96b585: uuid: set sruid uuid api hooks on module load
by Daniel-Constantin Mierla 18 Feb '22

18 Feb '22

Module: kamailio Branch: master Commit: ac96b585a5ed5a93fef65bcdbdb077fe6a75de22 URL: https://github.com/kamailio/kamailio/commit/ac96b585a5ed5a93fef65bcdbdb077f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-18T09:04:27+01:00 uuid: set sruid uuid api hooks on module load --- Modified: src/modules/uuid/uuid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ac96b585a5ed5a93fef65bcdbdb077f… Patch: https://github.com/kamailio/kamailio/commit/ac96b585a5ed5a93fef65bcdbdb077f… --- diff --git a/src/modules/uuid/uuid_mod.c b/src/modules/uuid/uuid_mod.c index 690d322b61..3bbee8bf6d 100644 --- a/src/modules/uuid/uuid_mod.c +++ b/src/modules/uuid/uuid_mod.c @@ -31,6 +31,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/pvar.h" +#include "../../core/kemi.h" #include "../../core/utils/sruid.h" MODULE_VERSION @@ -235,6 +236,95 @@ static int ksr_uuid_generate_random(char *out, int *len) return 0; } +/** + * + */ +static sr_kemi_xval_t _ksr_kemi_uuid_xval = {0}; + + +/** + * + */ +static sr_kemi_xval_t* ki_ksr_uuid_get(sip_msg_t *msg) +{ + int len = KSR_UUID_BSIZE; + + memset(&_ksr_kemi_uuid_xval, 0, sizeof(sr_kemi_xval_t)); + + if(ksr_uuid_generate(_k_uuid_str, &len)) { + sr_kemi_xval_null(&_ksr_kemi_uuid_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_uuid_xval; + } + _ksr_kemi_uuid_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_uuid_xval.v.s.s = _k_uuid_str; + _ksr_kemi_uuid_xval.v.s.len = len; + return &_ksr_kemi_uuid_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_ksr_uuid_rget(sip_msg_t *msg) +{ + int len = KSR_UUID_BSIZE; + + memset(&_ksr_kemi_uuid_xval, 0, sizeof(sr_kemi_xval_t)); + + if(ksr_uuid_generate_random(_k_uuid_str, &len)) { + sr_kemi_xval_null(&_ksr_kemi_uuid_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_uuid_xval; + } + _ksr_kemi_uuid_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_uuid_xval.v.s.s = _k_uuid_str; + _ksr_kemi_uuid_xval.v.s.len = len; + return &_ksr_kemi_uuid_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_ksr_uuid_tget(sip_msg_t *msg) +{ + int len = KSR_UUID_BSIZE; + + memset(&_ksr_kemi_uuid_xval, 0, sizeof(sr_kemi_xval_t)); + + if(ksr_uuid_generate_time(_k_uuid_str, &len)) { + sr_kemi_xval_null(&_ksr_kemi_uuid_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_uuid_xval; + } + _ksr_kemi_uuid_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_uuid_xval.v.s.s = _k_uuid_str; + _ksr_kemi_uuid_xval.v.s.len = len; + return &_ksr_kemi_uuid_xval; +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_uuid_exports[] = { + { str_init("uuid"), str_init("get"), + SR_KEMIP_XVAL, ki_ksr_uuid_get, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("uuid"), str_init("rget"), + SR_KEMIP_XVAL, ki_ksr_uuid_rget, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("uuid"), str_init("tget"), + SR_KEMIP_XVAL, ki_ksr_uuid_tget, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + + /** * */ @@ -248,5 +338,6 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) if(sruid_uuid_api_set(&sapi) < 0) { return -1; } + sr_kemi_modules_add(sr_kemi_uuid_exports); return 0; }

1 0

git:master:a593f518: pkg/kamailio/deb: fix rules
by Victor Seva 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: a593f518dd62fd68c330eb42470ce5d5e1dce636 URL: https://github.com/kamailio/kamailio/commit/a593f518dd62fd68c330eb42470ce5d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-18T00:18:03+01:00 pkg/kamailio/deb: fix rules --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/a593f518dd62fd68c330eb42470ce5d… Patch: https://github.com/kamailio/kamailio/commit/a593f518dd62fd68c330eb42470ce5d…

1 0

git:master:39a0a5d6: pkg/kamailio/deb: remove python*-dev dependency for module package
by Victor Seva 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: 39a0a5d6f43ab265f1003f7bbb6e981bcd2e3b72 URL: https://github.com/kamailio/kamailio/commit/39a0a5d6f43ab265f1003f7bbb6e981… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-17T23:38:57+01:00 pkg/kamailio/deb: remove python*-dev dependency for module package --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/39a0a5d6f43ab265f1003f7bbb6e981… Patch: https://github.com/kamailio/kamailio/commit/39a0a5d6f43ab265f1003f7bbb6e981…

1 0

git:master:d3ba5e29: pkg/kamailio/deb: sync control file with Debian
by Victor Seva 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: d3ba5e2927c2ac603637f26104177a7497fdb919 URL: https://github.com/kamailio/kamailio/commit/d3ba5e2927c2ac603637f26104177a7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-17T23:08:58+01:00 pkg/kamailio/deb: sync control file with Debian --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/d3ba5e2927c2ac603637f26104177a7… Patch: https://github.com/kamailio/kamailio/commit/d3ba5e2927c2ac603637f26104177a7…

1 0

git:master:7dbe4222: pkg/kamailio/deb: kamailio-nats-modules
by Victor Seva 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: 7dbe4222d0a20a7514c57a0ed3e9bdcfb14fb1c2 URL: https://github.com/kamailio/kamailio/commit/7dbe4222d0a20a7514c57a0ed3e9bdc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-02-17T23:27:27+01:00 pkg/kamailio/deb: kamailio-nats-modules for now just for sid, libnats-dev not yet in bookworm --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/backports/bionic Modified: pkg/kamailio/deb/debian/backports/bookworm Modified: pkg/kamailio/deb/debian/backports/bullseye Modified: pkg/kamailio/deb/debian/backports/buster Modified: pkg/kamailio/deb/debian/backports/focal Modified: pkg/kamailio/deb/debian/backports/jessie Modified: pkg/kamailio/deb/debian/backports/precise Modified: pkg/kamailio/deb/debian/backports/stretch Modified: pkg/kamailio/deb/debian/backports/trusty Modified: pkg/kamailio/deb/debian/backports/wheezy Modified: pkg/kamailio/deb/debian/backports/xenial Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/7dbe4222d0a20a7514c57a0ed3e9bdc… Patch: https://github.com/kamailio/kamailio/commit/7dbe4222d0a20a7514c57a0ed3e9bdc…

1 0

git:master:c3ffbce5: uuid: set sruid hooks for uuid generation on mod register
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: c3ffbce540d8a2fb58f193dcffebc2ed57cb802f URL: https://github.com/kamailio/kamailio/commit/c3ffbce540d8a2fb58f193dcffebc2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T13:00:48+01:00 uuid: set sruid hooks for uuid generation on mod register --- Modified: src/modules/uuid/uuid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c3ffbce540d8a2fb58f193dcffebc2e… Patch: https://github.com/kamailio/kamailio/commit/c3ffbce540d8a2fb58f193dcffebc2e… --- diff --git a/src/modules/uuid/uuid_mod.c b/src/modules/uuid/uuid_mod.c index 247d5830ab..690d322b61 100644 --- a/src/modules/uuid/uuid_mod.c +++ b/src/modules/uuid/uuid_mod.c @@ -31,6 +31,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/pvar.h" +#include "../../core/utils/sruid.h" MODULE_VERSION @@ -182,3 +183,70 @@ int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, uuid_unparse_lower(_k_uuid_val, _k_uuid_str); return pv_get_strzval(msg, param, res, _k_uuid_str); } + + +/** + * generate uuid value + */ +static int ksr_uuid_generate(char *out, int *len) +{ + if(out==NULL || len==NULL || *len<KSR_UUID_BSIZE) { + return -1; + } + uuid_generate(_k_uuid_val); + uuid_unparse_lower(_k_uuid_val, out); + *len = strlen(out); + return 0; +} + +/** + * generate uuid time value + */ +static int ksr_uuid_generate_time(char *out, int *len) +{ + if(out==NULL || len==NULL || *len<KSR_UUID_BSIZE) { + return -1; + } +#ifndef __OS_darwin + if(uuid_generate_time_safe(_k_uuid_val)!=0) { + LM_ERR("uuid not generated in a safe mode\n"); + return -1; + } +#else + uuid_generate_time(_k_uuid_val); +#endif + + uuid_unparse_lower(_k_uuid_val, out); + *len = strlen(out); + return 0; +} + +/** + * generate uuid random value + */ +static int ksr_uuid_generate_random(char *out, int *len) +{ + if(out==NULL || len==NULL || *len<KSR_UUID_BSIZE) { + return -1; + } + uuid_generate_random(_k_uuid_val); + uuid_unparse_lower(_k_uuid_val, out); + *len = strlen(out); + return 0; +} + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sruid_uuid_api_t sapi; + memset(&sapi, 0, sizeof(sruid_uuid_api_t)); + sapi.fgenerate = ksr_uuid_generate; + sapi.fgenerate_time = ksr_uuid_generate_time; + sapi.fgenerate_random = ksr_uuid_generate_random; + if(sruid_uuid_api_set(&sapi) < 0) { + return -1; + } + return 0; +}

1 0

Kamailio v5.5.4 Released
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Hello, Kamailio SIP Server v5.5.4 stable release is out. This is a maintenance release of the latest stable branch, 5.5, that includes fixes since the release of v5.5.3. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.4. For more details about version 5.5.4 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2022/02/kamailio-v5-5-4-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

[kamailio/kamailio] Kamailio active error (Issue #3033)
by LeoM30 17 Feb '22

17 Feb '22

ERROR: connect_unix_sock: connect(/var/run/kamailio//kamailio_ctl): No such file or directory [2] Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3033 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3033(a)github.com>

2 2

git:5.5:54c9df16: ChangeLog: content updated for v5.5.4
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: 54c9df16e8dde0fd5bf13e325dbead1eeb35c434 URL: https://github.com/kamailio/kamailio/commit/54c9df16e8dde0fd5bf13e325dbead1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:32:02+01:00 ChangeLog: content updated for v5.5.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/54c9df16e8dde0fd5bf13e325dbead1… Patch: https://github.com/kamailio/kamailio/commit/54c9df16e8dde0fd5bf13e325dbead1…

1 0

git:5.5:168a648d: Makefile.defs: version set to 5.5.4
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: 168a648d82e2b4e25ac3ff9443f837071589ac39 URL: https://github.com/kamailio/kamailio/commit/168a648d82e2b4e25ac3ff9443f8370… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:17:27+01:00 Makefile.defs: version set to 5.5.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/168a648d82e2b4e25ac3ff9443f8370… Patch: https://github.com/kamailio/kamailio/commit/168a648d82e2b4e25ac3ff9443f8370… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5efcd134dc..5fdc880c31 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:19be6f62: pkg/kamailio/deb: version set 5.5.4
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: 19be6f620328bfcb6e5fad0088f15aa4461eefbb URL: https://github.com/kamailio/kamailio/commit/19be6f620328bfcb6e5fad0088f15aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:12:44+01:00 pkg/kamailio/deb: version set 5.5.4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/19be6f620328bfcb6e5fad0088f15aa… Patch: https://github.com/kamailio/kamailio/commit/19be6f620328bfcb6e5fad0088f15aa…

1 0

git:5.5:d7b64f4b: pkg: version set to 5.5.4 for rpm and alpine specs
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: d7b64f4b369b347654d4e8a956c39072303e464a URL: https://github.com/kamailio/kamailio/commit/d7b64f4b369b347654d4e8a956c3907… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:16:20+01:00 pkg: version set to 5.5.4 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d7b64f4b369b347654d4e8a956c3907… Patch: https://github.com/kamailio/kamailio/commit/d7b64f4b369b347654d4e8a956c3907… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 9fcabf2cd1..7d27675324 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.3 +pkgver=5.5.4 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index fa6c13757e..ae5836f180 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.3 +%define ver 5.5.4 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.5:42d4359e: uuid: use define for buffer size
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: 5.5 Commit: 42d4359e6c3288fdfb705c5d0e38f47443048550 URL: https://github.com/kamailio/kamailio/commit/42d4359e6c3288fdfb705c5d0e38f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:10:24+01:00 uuid: use define for buffer size - log error if uuid was not generated in safe mode (cherry picked from commit e81f2e318bc32802d152ef69d005b8194e17ca42) --- Modified: src/modules/uuid/uuid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/42d4359e6c3288fdfb705c5d0e38f47… Patch: https://github.com/kamailio/kamailio/commit/42d4359e6c3288fdfb705c5d0e38f47… --- diff --git a/src/modules/uuid/uuid_mod.c b/src/modules/uuid/uuid_mod.c index a5aae589d8..247d5830ab 100644 --- a/src/modules/uuid/uuid_mod.c +++ b/src/modules/uuid/uuid_mod.c @@ -34,12 +34,18 @@ MODULE_VERSION +#ifdef UUID_LEN_STR +#define KSR_UUID_BSIZE (UUID_LEN_STR + 4) +#else +#define KSR_UUID_BSIZE 40 +#endif + static int mod_init(void); static int child_init(int); static void mod_destroy(void); static uuid_t _k_uuid_val; -static char _k_uuid_str[40]; +static char _k_uuid_str[KSR_UUID_BSIZE]; int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); @@ -162,8 +168,10 @@ int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, break; case 3: #ifndef __OS_darwin - if(uuid_generate_time_safe(_k_uuid_val)) + if(uuid_generate_time_safe(_k_uuid_val)!=0) { + LM_ERR("uuid not generated in a safe mode\n"); return pv_get_null(msg, param, res); + } #else uuid_generate_time(_k_uuid_val); #endif

1 0

git:master:f54788b5: core: sruid - api hooks for setting uuid generation callbacks
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Module: kamailio Branch: master Commit: f54788b5ac1109a2113592871c1494704523d527 URL: https://github.com/kamailio/kamailio/commit/f54788b5ac1109a2113592871c14947… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-17T10:06:29+01:00 core: sruid - api hooks for setting uuid generation callbacks - allow modules to set funtions for generating uuid strings following the api from libuuid --- Modified: src/core/utils/sruid.c Modified: src/core/utils/sruid.h --- Diff: https://github.com/kamailio/kamailio/commit/f54788b5ac1109a2113592871c14947… Patch: https://github.com/kamailio/kamailio/commit/f54788b5ac1109a2113592871c14947… --- diff --git a/src/core/utils/sruid.c b/src/core/utils/sruid.c index 510da8bb81..e7a49f2a62 100644 --- a/src/core/utils/sruid.c +++ b/src/core/utils/sruid.c @@ -49,6 +49,8 @@ static unsigned int sruid_lfsr32 = 0; static unsigned int sruid_lfsr31 = 0; +static sruid_uuid_api_t _sruid_uuid_api = {0}; + static int sruid_shift_lfsr(unsigned int *lfsr, unsigned int mask) { int feedback; @@ -267,3 +269,54 @@ int sruid_next_safe(sruid_t *sid) if(unlikely(sid->pid!=my_pid())) sruid_reinit(sid, sid->mode); return sruid_nextx(sid, NULL); } + +/** + * + */ +int sruid_uuid_api_set(sruid_uuid_api_t *sapi) +{ + if(_sruid_uuid_api.fgenerate!=NULL) { + LM_ERR("sruid uuid api already set\n"); + return -1; + } + + memcpy(&_sruid_uuid_api, sapi, sizeof(sruid_uuid_api_t)); + return 0; +} + +/** + * + */ +int sruid_uuid_generate(char *out, int *len) +{ + if(_sruid_uuid_api.fgenerate == NULL) { + *len = 0; + return -1; + } + return _sruid_uuid_api.fgenerate(out, len); +} + +/** + * + */ +int sruid_uuid_generate_time(char *out, int *len) +{ + if(_sruid_uuid_api.fgenerate_time == NULL) { + *len = 0; + return -1; + } + return _sruid_uuid_api.fgenerate_time(out, len); +} + +/** + * + */ +int sruid_uuid_generate_random(char *out, int *len) +{ + if(_sruid_uuid_api.fgenerate_random == NULL) { + *len = 0; + return -1; + } + return _sruid_uuid_api.fgenerate_random(out, len); +} + diff --git a/src/core/utils/sruid.h b/src/core/utils/sruid.h index 8d44635619..a97675167f 100644 --- a/src/core/utils/sruid.h +++ b/src/core/utils/sruid.h @@ -54,4 +54,17 @@ int sruid_nextx_safe(sruid_t *sid, str *x); int sruid_nexthid(sruid_t *sid, str *sval); int sruid_nexthid_safe(sruid_t *sid, str *sval); +typedef int (*sruid_uuid_generate_f)(char *out, int *len); + +typedef struct sruid_uuid_api { + sruid_uuid_generate_f fgenerate; + sruid_uuid_generate_f fgenerate_time; + sruid_uuid_generate_f fgenerate_random; +} sruid_uuid_api_t; + +int sruid_uuid_api_set(sruid_uuid_api_t *sapi); +int sruid_uuid_generate(char *out, int *len); +int sruid_uuid_generate_time(char *out, int *len); +int sruid_uuid_generate_random(char *out, int *len); + #endif

1 0

[kamailio/kamailio] Gte the current debug level (Issue #3030)
by Matthias Urlichs 17 Feb '22

17 Feb '22

#3029 ## Description While the `kex` module exports a way to temporarily change the debug level, it cannot retrieve the current level. ### Expected behavior I can write Python code like this: ``` if KSR.kex.getdebug() > 2: ... # generate detailed and somewhat-time-consuming debug output ... # which would just get dropped on the floor otherwise ``` #### Actual observed behavior If there is a way to get Kamailio's current and/or configured debug level, I didn't find it. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3030 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3030(a)github.com>

2 2

Releasing Kamailio v5.5.4
by Daniel-Constantin Mierla 17 Feb '22

17 Feb '22

Hello, I am considering to release Kamailio v5.5.4 later this week, likely on Thursday, Feb 17, 2022. This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Feb 21-24, 2022 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

git:master:e721e926: core: sruid - functions to get sruid with suffix from hasing a string
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: e721e9262c4b48c3c2f5107f5f5d6195243662db URL: https://github.com/kamailio/kamailio/commit/e721e9262c4b48c3c2f5107f5f5d619… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T13:34:05+01:00 core: sruid - functions to get sruid with suffix from hasing a string --- Modified: src/core/utils/sruid.c Modified: src/core/utils/sruid.h --- Diff: https://github.com/kamailio/kamailio/commit/e721e9262c4b48c3c2f5107f5f5d619… Patch: https://github.com/kamailio/kamailio/commit/e721e9262c4b48c3c2f5107f5f5d619… --- diff --git a/src/core/utils/sruid.c b/src/core/utils/sruid.c index d9f089e685..510da8bb81 100644 --- a/src/core/utils/sruid.c +++ b/src/core/utils/sruid.c @@ -36,6 +36,9 @@ #include "../../core/dprint.h" #include "../../core/globals.h" #include "../../core/pt.h" +#include "../../core/ut.h" +#include "../../core/trim.h" +#include "../../core/hashes.h" #include "sruid.h" @@ -211,6 +214,25 @@ int sruid_nextx(sruid_t *sid, str *x) return 0; } +/** + * + */ +int sruid_nexthid(sruid_t *sid, str *sval) +{ + char buf_int[INT2STR_MAX_LEN]; + str hval = str_init("0"); + unsigned int hid = 0; + + if(sval==NULL || sval->s==NULL || sval->len<=0) { + return sruid_nextx(sid, &hval); + } + hval = *sval; + trim(&hval); + hid = get_hash1_raw(hval.s, hval.len); + hval.s = int2strbuf(hid, buf_int, INT2STR_MAX_LEN, &hval.len); + return sruid_nextx(sid, &hval); +} + /** * */ @@ -228,6 +250,15 @@ int sruid_nextx_safe(sruid_t *sid, str *x) return sruid_nextx(sid, x); } +/** + * + */ +int sruid_nexthid_safe(sruid_t *sid, str *sval) +{ + if(unlikely(sid->pid!=my_pid())) sruid_reinit(sid, sid->mode); + return sruid_nexthid(sid, sval); +} + /** * */ diff --git a/src/core/utils/sruid.h b/src/core/utils/sruid.h index 7fdde96a95..8d44635619 100644 --- a/src/core/utils/sruid.h +++ b/src/core/utils/sruid.h @@ -51,4 +51,7 @@ int sruid_next_safe(sruid_t *sid); int sruid_nextx(sruid_t *sid, str *x); int sruid_nextx_safe(sruid_t *sid, str *x); +int sruid_nexthid(sruid_t *sid, str *sval); +int sruid_nexthid_safe(sruid_t *sid, str *sval); + #endif

1 0

Info: sipexer v1.0.0 - sip cli tool
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Hello, I want to announce the availability of sipexer v1.0.0 - a sip cli tool that can facilitate testing and monitoring of SIP signalling systems. It tries to have a modern approach, with a flexible templating system, supporting both IPv4 and IPv6 with all the common transport layers, respectively UDP, TCP, TLS and WebSocket (for WebRTC). The project can be found at: * https://github.com/miconda/sipexer It is written in Go language for better portability, binaries for Linux, MacOS and Windows are made available for download in the release page: * https://github.com/miconda/sipexer/releases/tag/v1.0.0 Among its features: * send OPTIONS request (quick SIP ping to check if server is alive) * do registration and un-registration with customized expires value and contact URI * authentication with plain or HA1 passwords * set custom SIP headers * template system for building SIP requests * fields in the templates can be set via command line parameters or a JSON file * variables for setting field values (e.g., random number, data, time, environment variables, uuid, random string, …) * simulate SIP calls at signalling layer (INVITE-wait-BYE) * respond to requests coming during SIP calls (e.g., OPTIONS keepalives) * send instant messages with SIP MESSAGE requests * color output mode for easier troubleshooting * support for many transport layers: IPv4 and IPv6, UDP, TCP, TLS and WebSocket (for WebRTC) * send SIP requests of any type (e.g., INFO, SUBSCRIBE, NOTIFY, …) One usage example that could ease the testing of Kamailio is initiating registrations or simulating calls over WebSocket without the need of having a JavaScript soft phone application running in a web browser. Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com

8 9

git:master:88f1a1a6: tmx: use trimmed call-id value for hashing
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: 88f1a1a671c4486e5000415b3d52eb42e6ad4cbb URL: https://github.com/kamailio/kamailio/commit/88f1a1a671c4486e5000415b3d52eb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T12:45:33+01:00 tmx: use trimmed call-id value for hashing --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/88f1a1a671c4486e5000415b3d52eb4… Patch: https://github.com/kamailio/kamailio/commit/88f1a1a671c4486e5000415b3d52eb4… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 256c82bf16..7bb2315fd3 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -243,7 +243,7 @@ int tmx_check_pretran(sip_msg_t *msg) sftag = get_from(msg)->tag_value; trim(&sftag); - chid = get_hash1_raw(msg->callid->body.s, msg->callid->body.len); + chid = get_hash1_raw(scallid.s, scallid.len); slotid = chid & (_tmx_ptran_size-1); if(unlikely(_tmx_proc_ptran == NULL)) {

1 0

git:master:0d688a69: async: exported functions to kemi to get async group name and data
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: 0d688a69e27b1ea49bf8c06469e1ce2e11006d95 URL: https://github.com/kamailio/kamailio/commit/0d688a69e27b1ea49bf8c06469e1ce2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T12:05:40+01:00 async: exported functions to kemi to get async group name and data --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/0d688a69e27b1ea49bf8c06469e1ce2… Patch: https://github.com/kamailio/kamailio/commit/0d688a69e27b1ea49bf8c06469e1ce2… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 60cd10e677..ee69e96e14 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -674,6 +674,16 @@ static sr_kemi_t sr_kemi_async_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("async"), str_init("get_gname"), + SR_KEMIP_XVAL, ki_async_get_gname, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("async"), str_init("get_data"), + SR_KEMIP_XVAL, ki_async_get_data, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index cfbfe98cef..b51887e351 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -675,3 +675,44 @@ int pv_parse_geoip_name(pv_spec_t *sp, str *in) LM_ERR("unknown PV time name %.*s\n", in->len, in->s); return -1; } + +/** + * + */ +static sr_kemi_xval_t _ksr_kemi_async_xval = {0}; + +/** + * + */ +sr_kemi_xval_t* ki_async_get_gname(sip_msg_t *msg) +{ + async_wgroup_t *awg = NULL; + + memset(&_ksr_kemi_async_xval, 0, sizeof(sr_kemi_xval_t)); + + awg = async_task_workers_get_crt(); + if(awg==NULL || awg->name.s==NULL || awg->name.len<0) { + sr_kemi_xval_null(&_ksr_kemi_async_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_async_xval; + } + _ksr_kemi_async_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_async_xval.v.s = awg->name; + return &_ksr_kemi_async_xval; +} + +/** + * + */ +sr_kemi_xval_t* ki_async_get_data(sip_msg_t *msg) +{ + memset(&_ksr_kemi_async_xval, 0, sizeof(sr_kemi_xval_t)); + + if(_ksr_async_data_param==NULL || _ksr_async_data_param->sval.s==NULL + || _ksr_async_data_param->sval.len<0) { + sr_kemi_xval_null(&_ksr_kemi_async_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_async_xval; + } + _ksr_kemi_async_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_async_xval.v.s = _ksr_async_data_param->sval; + return &_ksr_kemi_async_xval; +} diff --git a/src/modules/async/async_sleep.h b/src/modules/async/async_sleep.h index bb7dd042ce..254962bd70 100644 --- a/src/modules/async/async_sleep.h +++ b/src/modules/async/async_sleep.h @@ -56,4 +56,7 @@ int async_send_data(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_parse_async_name(pv_spec_t *sp, str *in); +sr_kemi_xval_t* ki_async_get_gname(sip_msg_t *msg); +sr_kemi_xval_t* ki_async_get_data(sip_msg_t *msg); + #endif

1 0

git:master:e81f2e31: uuid: use define for buffer size
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: e81f2e318bc32802d152ef69d005b8194e17ca42 URL: https://github.com/kamailio/kamailio/commit/e81f2e318bc32802d152ef69d005b81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T10:18:17+01:00 uuid: use define for buffer size - log error if uuid was not generated in safe mode --- Modified: src/modules/uuid/uuid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e81f2e318bc32802d152ef69d005b81… Patch: https://github.com/kamailio/kamailio/commit/e81f2e318bc32802d152ef69d005b81… --- diff --git a/src/modules/uuid/uuid_mod.c b/src/modules/uuid/uuid_mod.c index a5aae589d8..247d5830ab 100644 --- a/src/modules/uuid/uuid_mod.c +++ b/src/modules/uuid/uuid_mod.c @@ -34,12 +34,18 @@ MODULE_VERSION +#ifdef UUID_LEN_STR +#define KSR_UUID_BSIZE (UUID_LEN_STR + 4) +#else +#define KSR_UUID_BSIZE 40 +#endif + static int mod_init(void); static int child_init(int); static void mod_destroy(void); static uuid_t _k_uuid_val; -static char _k_uuid_str[40]; +static char _k_uuid_str[KSR_UUID_BSIZE]; int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); @@ -162,8 +168,10 @@ int pv_get_uuid(sip_msg_t *msg, pv_param_t *param, break; case 3: #ifndef __OS_darwin - if(uuid_generate_time_safe(_k_uuid_val)) + if(uuid_generate_time_safe(_k_uuid_val)!=0) { + LM_ERR("uuid not generated in a safe mode\n"); return pv_get_null(msg, param, res); + } #else uuid_generate_time(_k_uuid_val); #endif

1 0

git:master:b311a01c: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: b311a01cde334106cea4ee777d40a75f0fab491f URL: https://github.com/kamailio/kamailio/commit/b311a01cde334106cea4ee777d40a75… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-16T09:46:22+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/b311a01cde334106cea4ee777d40a75… Patch: https://github.com/kamailio/kamailio/commit/b311a01cde334106cea4ee777d40a75… --- diff --git a/src/modules/async/README b/src/modules/async/README index 744e98bf3e..8e165efa95 100644 --- a/src/modules/async/README +++ b/src/modules/async/README @@ -36,6 +36,8 @@ Daniel-Constantin Mierla 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) 4.6. async_task_group_route(routename, groupname) + 4.7. async_task_data(routename, data) + 4.8. async_task_group_data(routename, groupname, data) List of Examples @@ -48,6 +50,8 @@ Daniel-Constantin Mierla 1.7. async_workers usage 1.8. async_task_route usage 1.9. async_task_group_route usage + 1.10. async_task_data usage + 1.11. async_task_group_data usage Chapter 1. Admin Guide @@ -72,6 +76,8 @@ Chapter 1. Admin Guide 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) 4.6. async_task_group_route(routename, groupname) + 4.7. async_task_data(routename, data) + 4.8. async_task_group_data(routename, groupname, data) 1. Overview @@ -143,6 +149,8 @@ modparam("async", "ms_timer", 10) 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) 4.6. async_task_group_route(routename, groupname) + 4.7. async_task_data(routename, data) + 4.8. async_task_group_data(routename, groupname, data) 4.1. async_route(routename, seconds) @@ -335,3 +343,54 @@ route[RESUME] { exit; } ... + +4.7. async_task_data(routename, data) + + Send the data to a asynchronous task process (in the first group) that + executes the route[rountename] and makes the data available via + $async(data). + + The current SIP message is not suspended and it is not available in the + asynchronous task process, a local faked SIP request is used there. + + The parameters can contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.10. async_task_data usage +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_data("RESUME", "caller: $fU - callee: $tU"); + ... +} +route[RESUME] { + xinfo("$async(data)\n"); + exit; +} +... + +4.8. async_task_group_data(routename, groupname, data) + + Similar to async_task_route(), but allows to specify the name of the + group for asynchronous workers. See also 'async_workers_group' core + global parameter. + + This function can be used from ANY_ROUTE. + + Example 1.11. async_task_group_data usage +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_data("RESUME", "abc", "caller: $fU - callee: $tU"); + ... +} +route[RESUME] { + xinfo("$async(data)\n"); + exit; +} +...

1 0

git:master:6462571b: async: docs for async task data functions
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: 6462571bbdf1270516243b6759a26625ca874b80 URL: https://github.com/kamailio/kamailio/commit/6462571bbdf1270516243b6759a2662… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T09:39:43+01:00 async: docs for async task data functions --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6462571bbdf1270516243b6759a2662… Patch: https://github.com/kamailio/kamailio/commit/6462571bbdf1270516243b6759a2662… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index 1db4d60e9e..b0e5ec45bd 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -370,6 +370,74 @@ route[RESUME] { exit; } ... +</programlisting> + </example> + </section> + <section id="async.f.async_task_data"> + <title> + <function moreinfo="none">async_task_data(routename, data)</function> + </title> + <para> + Send the data to a asynchronous task process (in the first group) that + executes the route[rountename] and makes the data available via $async(data). + </para> + <para> + The current SIP message is not suspended and it is not available in + the asynchronous task process, a local faked SIP request is used there. + </para> + <para> + The parameters can contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>async_task_data</function> usage</title> + <programlisting format="linespecific"> +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_data("RESUME", "caller: $fU - callee: $tU"); + ... +} +route[RESUME] { + xinfo("$async(data)\n"); + exit; +} +... +</programlisting> + </example> + </section> + <section id="async.f.async_task_group_data"> + <title> + <function moreinfo="none">async_task_group_data(routename, groupname, data)</function> + </title> + <para> + Similar to async_task_route(), but allows to specify the name of the group + for asynchronous workers. See also 'async_workers_group' core global + parameter. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>async_task_group_data</function> usage</title> + <programlisting format="linespecific"> +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_data("RESUME", "abc", "caller: $fU - callee: $tU"); + ... +} +route[RESUME] { + xinfo("$async(data)\n"); + exit; +} +... </programlisting> </example> </section>

1 0

git:master:e9595b5f: async: allow async task data functions in any route
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: e9595b5fcc758a50cea5dcaa0d9109e2f349ecca URL: https://github.com/kamailio/kamailio/commit/e9595b5fcc758a50cea5dcaa0d9109e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T09:39:43+01:00 async: allow async task data functions in any route --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e9595b5fcc758a50cea5dcaa0d9109e… Patch: https://github.com/kamailio/kamailio/commit/e9595b5fcc758a50cea5dcaa0d9109e… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 69717273b9..60cd10e677 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -79,9 +79,9 @@ static cmd_export_t cmds[]={ {"async_task_group_route", (cmd_function)w_async_task_group_route, 2, fixup_async_task_route, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"async_task_data", (cmd_function)w_async_task_data, 2, fixup_async_task_route, - 0, REQUEST_ROUTE|FAILURE_ROUTE}, + 0, ANY_ROUTE}, {"async_task_group_data", (cmd_function)w_async_task_group_data, 3, fixup_async_task_route, - 0, REQUEST_ROUTE|FAILURE_ROUTE}, + 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -104,7 +104,7 @@ struct module_exports exports = { cmds, params, 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ + mod_pvs, /* exported pseudo-variables */ 0, /* response function */ mod_init, /* module initialization function */ child_init, /* per child init function */

1 0

git:master:5f32e36b: async: functions to execute async tasks only with custom data
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: 5f32e36b94ec21836fa910062e4121a8e47019fc URL: https://github.com/kamailio/kamailio/commit/5f32e36b94ec21836fa910062e4121a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T09:39:43+01:00 async: functions to execute async tasks only with custom data - variants which don't suspend transaction, just pass some custom data to async workers to execute route blocks with faked message --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/5f32e36b94ec21836fa910062e4121a… Patch: https://github.com/kamailio/kamailio/commit/5f32e36b94ec21836fa910062e4121a…

1 0

git:master:a2b08993: async: added variable $async(key)
by Daniel-Constantin Mierla 16 Feb '22

16 Feb '22

Module: kamailio Branch: master Commit: a2b089939afc5309fc86d68bc9d43619bda4fec5 URL: https://github.com/kamailio/kamailio/commit/a2b089939afc5309fc86d68bc9d4361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-16T09:39:43+01:00 async: added variable $async(key) - get async task group name and async task data --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/a2b089939afc5309fc86d68bc9d4361… Patch: https://github.com/kamailio/kamailio/commit/a2b089939afc5309fc86d68bc9d4361… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index 1020cd0c46..69717273b9 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -92,6 +92,12 @@ static param_export_t params[]={ {0, 0, 0} }; +static pv_export_t mod_pvs[] = { + { {"async", sizeof("async")-1}, PVT_OTHER, pv_get_async, 0, + pv_parse_async_name, 0, 0, 0 }, + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + struct module_exports exports = { "async", DEFAULT_DLFLAGS, /* dlopen flags */ diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 7c46174284..cfbfe98cef 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -619,3 +619,59 @@ int async_send_data(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, return 0; } + + +/** + * + */ +int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + async_wgroup_t *awg = NULL; + + switch(param->pvn.u.isname.name.n) { + case 0: + if(_ksr_async_data_param==NULL || _ksr_async_data_param->sval.s==NULL + || _ksr_async_data_param->sval.len<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &_ksr_async_data_param->sval); + case 1: + awg = async_task_workers_get_crt(); + if(awg==NULL || awg->name.s==NULL || awg->name.len<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &awg->name); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +int pv_parse_geoip_name(pv_spec_t *sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) { + case 4: + if(strncmp(in->s, "data", 4)==0) + sp->pvp.pvn.u.isname.name.n = 0; + break; + case 5: + if(strncmp(in->s, "gname", 5)==0) + sp->pvp.pvn.u.isname.name.n = 1; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV time name %.*s\n", in->len, in->s); + return -1; +} diff --git a/src/modules/async/async_sleep.h b/src/modules/async/async_sleep.h index 2da46556f2..bb7dd042ce 100644 --- a/src/modules/async/async_sleep.h +++ b/src/modules/async/async_sleep.h @@ -53,4 +53,7 @@ int async_send_task(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname); int async_send_data(sip_msg_t *msg, cfg_action_t *act, str *cbname, str *gname, str *sdata); +int pv_get_async(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_async_name(pv_spec_t *sp, str *in); + #endif

1 0

[kamailio/kamailio] [tm.so] To-Tag in 200ok for CANCEL request (Issue #3021)
by alexey-khabulyak 15 Feb '22

15 Feb '22

Hi. I have simple call flow: ``` UAS PROXY UAS 1 | INVITE | | |---------->| | 2 | 100 | | |<----------| | 3 | | INVITE | | |---------->| 4 | | 100 | | |<----------| 5 | | 180 | | |<----------| 6 | 180 | | |<----------| | 7 | | 183 | | |<----------| 8 | 183 | | |<----------| | 9 | CANCEL | | |---------->| | 10| | CANCEL | | |---------->| 11| 200 | | |<----------| | 12| | 200 | | |<----------| 13| | 487 | | |<----------| 14| | ACK | | |---------->| 15| 487 | | |<----------| | 16| ACK | | |---------->| | ``` One of our customers complains that TO-TAGs in 183 (packet 8) and 200(packet 11) are not equal(their devices see 3 to-tag during 1 dialog). I found in RFC 3261that it's ok(https://datatracker.ietf.org/doc/html/rfc3261#section-16.10). 183 is forwarded from UAS(UAS sets to-tag) and 200 is generated by Kamailio. This is why to-tags in 183 and 200 are not equal. Is it possible to use to-tag from master branch(ofc if we have received a reply from UAS and we have this tag)? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3021 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3021(a)github.com>

2 3

[kamailio/kamailio] Kamailio Activation Failed (Issue #3027)
by LeoM30 15 Feb '22

15 Feb '22

kamailio[20903]: ERROR: <core> [core/tcp_main.c:3101]: tcp_init(): bind(2d, 0x7f7cff0ff610, 16) on xxx.xxx.xx.xx:5060 : Address already in use #Sudo kamailio status ERROR: connect_unix_sock: connect(/var/run/kamailio//kamailio_ctl): No such file or directory Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3027 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3027(a)github.com>

2 2

[kamailio/kamailio] SIP redirect server cannot changes port service (Issue #3026)
by bayupmail 15 Feb '22

15 Feb '22

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` Hello Experts, please help me to change port service from default 5060 port into other port due to security reason. Since I have change port in kamailio.cfg file, but services cannot fly normally that shown client unable login online (status not online). ![image](https://user-images.githubusercontent.com/76675592/154027407-24ab423b-302b-435e-bad4-5dcb22a5ad3d.png) Besides, I need to run the kamailio services after install default kamailio, I have not found where procedure found in this installation process. Thanks Bp -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3026 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3026(a)github.com>

2 2

git:5.4:dfcb993e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 Feb '22

15 Feb '22

Module: kamailio Branch: 5.4 Commit: dfcb993e65f47ab5ca8c56a9b1783d5f37c8bc84 URL: https://github.com/kamailio/kamailio/commit/dfcb993e65f47ab5ca8c56a9b1783d5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-15T09:47:02+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/dfcb993e65f47ab5ca8c56a9b1783d5… Patch: https://github.com/kamailio/kamailio/commit/dfcb993e65f47ab5ca8c56a9b1783d5… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 0b23347716..9cb4426a73 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1046,7 +1046,7 @@ modparam("dispatcher", "reload_delta", 1) + “0” - hash over callid + “1” - hash over from URI. + “2” - hash over to URI. - + “3” - hash over request-URI. + + “3” - hash over request-URI user. + “4” - round-robin (next destination). + “5” - hash over authorization-username (Proxy-Authorization or "normal" authorization). If no username is found, round robin

1 0

git:5.5:315b22ad: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 Feb '22

15 Feb '22

Module: kamailio Branch: 5.5 Commit: 315b22adf71908f147760b161045c9dda3ff1979 URL: https://github.com/kamailio/kamailio/commit/315b22adf71908f147760b161045c9d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-15T09:46:42+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/315b22adf71908f147760b161045c9d… Patch: https://github.com/kamailio/kamailio/commit/315b22adf71908f147760b161045c9d… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 5b029903f4..09a96871e8 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1051,7 +1051,7 @@ modparam("dispatcher", "reload_delta", 1) + “0” - hash over callid + “1” - hash over from URI. + “2” - hash over to URI. - + “3” - hash over request-URI. + + “3” - hash over request-URI user. + “4” - round-robin (next destination). + “5” - hash over authorization-username (Proxy-Authorization or "normal" authorization). If no username is found, round robin

1 0

git:master:961f2766: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 15 Feb '22

15 Feb '22

Module: kamailio Branch: master Commit: 961f27665394010d517e54c7e3e2e8da0916cce7 URL: https://github.com/kamailio/kamailio/commit/961f27665394010d517e54c7e3e2e8d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-15T09:46:21+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/961f27665394010d517e54c7e3e2e8d… Patch: https://github.com/kamailio/kamailio/commit/961f27665394010d517e54c7e3e2e8d… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 76e24ffa69..6f9146b8d6 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1055,7 +1055,7 @@ modparam("dispatcher", "reload_delta", 1) + “0” - hash over callid + “1” - hash over from URI. + “2” - hash over to URI. - + “3” - hash over request-URI. + + “3” - hash over request-URI user. + “4” - round-robin (next destination). + “5” - hash over authorization-username (Proxy-Authorization or "normal" authorization). If no username is found, round robin

1 0

git:5.5:76a5a7a9: dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1)
by Henning Westerholt 15 Feb '22

15 Feb '22

Module: kamailio Branch: 5.5 Commit: 76a5a7a999d0e37499bcc2ba1e412ae1f10a4f6c URL: https://github.com/kamailio/kamailio/commit/76a5a7a999d0e37499bcc2ba1e412ae… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-02-15T08:35:12Z dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1) (cherry picked from commit 0f633c0def3759078fea427597190fab196c89bd) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/76a5a7a999d0e37499bcc2ba1e412ae… Patch: https://github.com/kamailio/kamailio/commit/76a5a7a999d0e37499bcc2ba1e412ae… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 0ac1a430e6..a7191681bc 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1154,7 +1154,7 @@ modparam("dispatcher", "reload_delta", 1) </listitem> <listitem> <para> - <quote>3</quote> - hash over request-URI. + <quote>3</quote> - hash over request-URI user. </para> </listitem> <listitem>

1 0

git:5.4:bf172e99: dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1)
by Henning Westerholt 15 Feb '22

15 Feb '22

Module: kamailio Branch: 5.4 Commit: bf172e998ed2a7cfe58635d0722717e40ebf6eea URL: https://github.com/kamailio/kamailio/commit/bf172e998ed2a7cfe58635d0722717e… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-02-15T08:34:55Z dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1) (cherry picked from commit 0f633c0def3759078fea427597190fab196c89bd) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bf172e998ed2a7cfe58635d0722717e… Patch: https://github.com/kamailio/kamailio/commit/bf172e998ed2a7cfe58635d0722717e… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 30f32ca038..a0e841b3ce 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1150,7 +1150,7 @@ modparam("dispatcher", "reload_delta", 1) </listitem> <listitem> <para> - <quote>3</quote> - hash over request-URI. + <quote>3</quote> - hash over request-URI user. </para> </listitem> <listitem>

1 0

git:master:0f633c0d: dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1)
by Henning Westerholt 15 Feb '22

15 Feb '22

Module: kamailio Branch: master Commit: 0f633c0def3759078fea427597190fab196c89bd URL: https://github.com/kamailio/kamailio/commit/0f633c0def3759078fea427597190fa… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-02-15T08:30:47Z dispatcher: small docs extension, algo 3 hashes only over r-uri user (DS_HASH_USER_ONLY 1) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0f633c0def3759078fea427597190fa… Patch: https://github.com/kamailio/kamailio/commit/0f633c0def3759078fea427597190fa… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 7507773e13..78523a7c1b 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1154,7 +1154,7 @@ modparam("dispatcher", "reload_delta", 1) </listitem> <listitem> <para> - <quote>3</quote> - hash over request-URI. + <quote>3</quote> - hash over request-URI user. </para> </listitem> <listitem>

1 0

git:master:a78b2dcd: modules: readme files regenerated - async ... [skip ci]
by Kamailio Dev 15 Feb '22

15 Feb '22

Module: kamailio Branch: master Commit: a78b2dcdb484dd3c58b5c3c59e6e627bf2947516 URL: https://github.com/kamailio/kamailio/commit/a78b2dcdb484dd3c58b5c3c59e6e627… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-15T08:16:18+01:00 modules: readme files regenerated - async ... [skip ci] --- Modified: src/modules/async/README --- Diff: https://github.com/kamailio/kamailio/commit/a78b2dcdb484dd3c58b5c3c59e6e627… Patch: https://github.com/kamailio/kamailio/commit/a78b2dcdb484dd3c58b5c3c59e6e627… --- diff --git a/src/modules/async/README b/src/modules/async/README index e26f2ea584..744e98bf3e 100644 --- a/src/modules/async/README +++ b/src/modules/async/README @@ -35,6 +35,7 @@ Daniel-Constantin Mierla 4.3. async_sleep(seconds) 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) + 4.6. async_task_group_route(routename, groupname) List of Examples @@ -46,6 +47,7 @@ Daniel-Constantin Mierla 1.6. async_ms_sleep usage 1.7. async_workers usage 1.8. async_task_route usage + 1.9. async_task_group_route usage Chapter 1. Admin Guide @@ -69,6 +71,7 @@ Chapter 1. Admin Guide 4.3. async_sleep(seconds) 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) + 4.6. async_task_group_route(routename, groupname) 1. Overview @@ -139,6 +142,7 @@ modparam("async", "ms_timer", 10) 4.3. async_sleep(seconds) 4.4. async_ms_sleep(milliseconds) 4.5. async_task_route(routename) + 4.6. async_task_group_route(routename, groupname) 4.1. async_route(routename, seconds) @@ -266,10 +270,11 @@ route[REQUESTSHAPER] { 4.5. async_task_route(routename) Continue the processing of the SIP request with the route[routename] in - one of the processes from core asynchronous framework. The core - parameter async_workers has to be set to enable asynchronous framework. - The task is executed as soon as a process from asynchronous framework - is idle, there is no wait time for the task like for async_route(...). + one of the processes from first group of core asynchronous framework. + The core parameter async_workers has to be set to enable asynchronous + framework. The task is executed as soon as a process from asynchronous + framework is idle, there is no wait time for the task like for + async_route(...). To enable the core asynchronous framework, you need to set the async_workers core parameter in the configuration file. See the core @@ -307,3 +312,26 @@ route[RESUME] { exit; } ... + +4.6. async_task_group_route(routename, groupname) + + Similar to async_task_route(), but allows to specify the name of the + group for asynchronous workers. See also 'async_workers_group' core + global parameter. + + This function can be used from REQUEST_ROUTE. + + Example 1.9. async_task_group_route usage +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_route("RESUME", "abc"); + ... +} +route[RESUME] { + t_relay(); + exit; +} +...

1 0

git:master:5f590180: async: docs for async_task_group_route(routename, groupname)
by Daniel-Constantin Mierla 15 Feb '22

15 Feb '22

Module: kamailio Branch: master Commit: 5f590180c3acc5f786c1d0667997c1b3b8924ed9 URL: https://github.com/kamailio/kamailio/commit/5f590180c3acc5f786c1d0667997c1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-15T08:10:54+01:00 async: docs for async_task_group_route(routename, groupname) --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5f590180c3acc5f786c1d0667997c1b… Patch: https://github.com/kamailio/kamailio/commit/5f590180c3acc5f786c1d0667997c1b… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index a56c60d7d2..1db4d60e9e 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -287,8 +287,8 @@ route[REQUESTSHAPER] { </title> <para> Continue the processing of the SIP request with the route[routename] - in one of the processes from core asynchronous framework. The core - parameter async_workers has to be set to enable asynchronous + in one of the processes from first group of core asynchronous framework. + The core parameter async_workers has to be set to enable asynchronous framework. The task is executed as soon as a process from asynchronous framework is idle, there is no wait time for the task like for async_route(...). @@ -339,6 +339,37 @@ route[RESUME] { exit; } ... +</programlisting> + </example> + </section> + <section id="async.f.async_task_group_route"> + <title> + <function moreinfo="none">async_task_group_route(routename, groupname)</function> + </title> + <para> + Similar to async_task_route(), but allows to specify the name of the group + for asynchronous workers. See also 'async_workers_group' core global + parameter. + </para> + <para> + This function can be used from REQUEST_ROUTE. + </para> + <example> + <title><function>async_task_group_route</function> usage</title> + <programlisting format="linespecific"> +... +async_workers_group="name=abc;workers=4;nonblock=0;usleep=0" +... +request_route { + ... + async_task_route("RESUME", "abc"); + ... +} +route[RESUME] { + t_relay(); + exit; +} +... </programlisting> </example> </section>

1 0

git:master:812e77d3: async: added async_task_group_route(routename, groupname) function
by Daniel-Constantin Mierla 15 Feb '22

15 Feb '22

Module: kamailio Branch: master Commit: 812e77d393faf9b49f54d7fc16e3aa5e74168a5d URL: https://github.com/kamailio/kamailio/commit/812e77d393faf9b49f54d7fc16e3aa5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-15T08:09:52+01:00 async: added async_task_group_route(routename, groupname) function - similar to async_task_route() that allows to specify the group of async task processes --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/812e77d393faf9b49f54d7fc16e3aa5… Patch: https://github.com/kamailio/kamailio/commit/812e77d393faf9b49f54d7fc16e3aa5…

1 0

git:master:546639ba: core: async task - keep group structure as global for own processes
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: master Commit: 546639ba55e8d0e3116d4d2bb1999d7a44f6fe69 URL: https://github.com/kamailio/kamailio/commit/546639ba55e8d0e3116d4d2bb1999d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T15:17:11+01:00 core: async task - keep group structure as global for own processes --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/546639ba55e8d0e3116d4d2bb1999d7… Patch: https://github.com/kamailio/kamailio/commit/546639ba55e8d0e3116d4d2bb1999d7… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index b64e071a11..a96eb90286 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -46,6 +46,7 @@ #include "async_task.h" static async_wgroup_t *_async_wgroup_list = NULL; +static async_wgroup_t *_async_wgroup_crt = NULL; int async_task_run(async_wgroup_t *awg, int idx); @@ -68,6 +69,14 @@ int async_task_workers_active(void) return 1; } +/** + * + */ +async_wgroup_t *async_task_workers_get_crt(void) +{ + return _async_wgroup_crt; +} + /** * */ @@ -446,6 +455,8 @@ int async_task_run(async_wgroup_t *awg, int idx) LM_DBG("async task worker [%.*s] idx [%d] ready\n", awg->name.len, awg->name.s, idx); + _async_wgroup_crt = awg; + for( ; ; ) { if(unlikely(awg->usleep)) sleep_us(awg->usleep); if ((received = recvfrom(awg->sockets[0], diff --git a/src/core/async_task.h b/src/core/async_task.h index 6539f7f92e..4f6a3598b1 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -50,6 +50,7 @@ int async_task_push(async_task_t *task); int async_task_set_usleep(int n); int async_task_workers_get(void); int async_task_workers_active(void); +async_wgroup_t *async_task_workers_get_crt(void); int async_task_group_push(str *gname, async_task_t *task);

1 0

git:5.5:3c3ffd80: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 3c3ffd803192b92f126f7f08119459593eafe30c URL: https://github.com/kamailio/kamailio/commit/3c3ffd803192b92f126f7f081194595… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-02-14T15:17:04+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/xmlops/README --- Diff: https://github.com/kamailio/kamailio/commit/3c3ffd803192b92f126f7f081194595… Patch: https://github.com/kamailio/kamailio/commit/3c3ffd803192b92f126f7f081194595… --- diff --git a/src/modules/xmlops/README b/src/modules/xmlops/README index 0ecfcb5ca0..df62770802 100644 --- a/src/modules/xmlops/README +++ b/src/modules/xmlops/README @@ -93,11 +93,28 @@ modparam("xmlops", "buf_size", 8192) 3.2. xml_ns (str) Register xml namespace prefix. Parameter value must have the format: - 'prefix=uri'. + 'prefix=uri'. It can be set many times to cope with multiple namespaces + without prefix. + + This is useful when it is needed to access XML documents that specify + xmlns without prefix, which is not XML-standard compliant, but it comes + with SIP SIMPLE presence bodies. Example 1.2. Set xml_ns parameter ... modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") +modparam("xmlops", "xml_ns", "pidf=urn:ietf:params:xml:ns:pidf") +... +$xml(x=>doc) = '<?xml version="1.0" encoding="utf-8"?> + <presence xmlns="urn:ietf:params:xml:ns:pidf" entity="sip:test@mydomain.com" +> + <tuple id="86ae65b7-42de-4399-b635-295caad13aac"> + <status><basic>none</basic></status> + </tuple> + </presence>'; + +xinfo("status: $xml(x=>xpath:/pidf:presence/pidf:tuple/pidf:status/pidf:basic)\n +"); ... 4. Pseudo-Variables

1 0

git:5.5:78710d9d: xmlops: docs - added the remark that xml_ns param can be set many times
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 78710d9da5cfe117190694cd3b77ced54414a2e8 URL: https://github.com/kamailio/kamailio/commit/78710d9da5cfe117190694cd3b77ced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:04:01+01:00 xmlops: docs - added the remark that xml_ns param can be set many times (cherry picked from commit 56e26387b77536e6c9f13dd62e5aecabaaba2d9a) --- Modified: src/modules/xmlops/doc/xmlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/78710d9da5cfe117190694cd3b77ced… Patch: https://github.com/kamailio/kamailio/commit/78710d9da5cfe117190694cd3b77ced… --- diff --git a/src/modules/xmlops/doc/xmlops_admin.xml b/src/modules/xmlops/doc/xmlops_admin.xml index d78247d310..d9a6e04a5d 100644 --- a/src/modules/xmlops/doc/xmlops_admin.xml +++ b/src/modules/xmlops/doc/xmlops_admin.xml @@ -68,7 +68,8 @@ modparam("xmlops", "buf_size", 8192) <title><varname>xml_ns</varname> (str)</title> <para> Register xml namespace prefix. Parameter value must have the format: - 'prefix=uri'. + 'prefix=uri'. It can be set many times to cope with multiple namespaces + without prefix. </para> <para> This is useful when it is needed to access XML documents that specify @@ -80,6 +81,7 @@ modparam("xmlops", "buf_size", 8192) <programlisting format="linespecific"> <![CDATA[ ... +modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") modparam("xmlops", "xml_ns", "pidf=urn:ietf:params:xml:ns:pidf") ... $xml(x=>doc) = '<?xml version="1.0" encoding="utf-8"?>

1 0

git:5.5:19cef203: core: updated description for core.psa rpc command
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 19cef203a1b487174ce7a0e66431b2c03bf78c65 URL: https://github.com/kamailio/kamailio/commit/19cef203a1b487174ce7a0e66431b2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:03:33+01:00 core: updated description for core.psa rpc command (cherry picked from commit aca381d30413eb1b43abf9e7e3b1306854ceb117) --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/19cef203a1b487174ce7a0e66431b2c… Patch: https://github.com/kamailio/kamailio/commit/19cef203a1b487174ce7a0e66431b2c… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index ba17c06e47..3fb2e6d8d7 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -439,7 +439,7 @@ static void core_psx(rpc_t* rpc, void* c) } static const char* core_psa_doc[] = { - "Return all the attributes of running.", + "Return all the attributes of running processes.", /* Documentation string */ 0 /* Method signature(s) */ };

1 0

git:5.5:207e0d9f: xmlops: docs - more practical example for xml_ns
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 207e0d9f80b2e1a48c7c21844f158e231bfd8e1e URL: https://github.com/kamailio/kamailio/commit/207e0d9f80b2e1a48c7c21844f158e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:03:43+01:00 xmlops: docs - more practical example for xml_ns (cherry picked from commit 0cb6a0640e9e3e2e06d2c5bc68c6177d5bd38b89) --- Modified: src/modules/xmlops/doc/xmlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/207e0d9f80b2e1a48c7c21844f158e2… Patch: https://github.com/kamailio/kamailio/commit/207e0d9f80b2e1a48c7c21844f158e2… --- diff --git a/src/modules/xmlops/doc/xmlops_admin.xml b/src/modules/xmlops/doc/xmlops_admin.xml index 7082b03b1f..d78247d310 100644 --- a/src/modules/xmlops/doc/xmlops_admin.xml +++ b/src/modules/xmlops/doc/xmlops_admin.xml @@ -68,13 +68,30 @@ modparam("xmlops", "buf_size", 8192) <title><varname>xml_ns</varname> (str)</title> <para> Register xml namespace prefix. Parameter value must have the format: - 'prefix=uri'.</para> + 'prefix=uri'. + </para> + <para> + This is useful when it is needed to access XML documents that specify + xmlns without prefix, which is not XML-standard compliant, but it + comes with SIP SIMPLE presence bodies. + </para> <example> <title>Set <varname>xml_ns</varname> parameter</title> <programlisting format="linespecific"> +<![CDATA[ ... -modparam("xmlops", "xml_ns", "rpid=urn:ietf:params:xml:ns:pidf:rpid") +modparam("xmlops", "xml_ns", "pidf=urn:ietf:params:xml:ns:pidf") +... +$xml(x=>doc) = '<?xml version="1.0" encoding="utf-8"?> + <presence xmlns="urn:ietf:params:xml:ns:pidf" entity="sip:test@mydomain.com"> + <tuple id="86ae65b7-42de-4399-b635-295caad13aac"> + <status><basic>none</basic></status> + </tuple> + </presence>'; + +xinfo("status: $xml(x=>xpath:/pidf:presence/pidf:tuple/pidf:status/pidf:basic)\n"); ... +]]> </programlisting> </example> </section>

1 0

git:5.5:43b94264: src/Makefile: Also stop compiling kamcmd from here
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 43b94264f81e54625ee90faa7f52b006b67a1b61 URL: https://github.com/kamailio/kamailio/commit/43b94264f81e54625ee90faa7f52b00… Author: Adrian Bunk <bunk(a)debian.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:03:19+01:00 src/Makefile: Also stop compiling kamcmd from here (cherry picked from commit c1335157c53ca014bbeec6de312f42d955221d58) --- Modified: src/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/43b94264f81e54625ee90faa7f52b00… Patch: https://github.com/kamailio/kamailio/commit/43b94264f81e54625ee90faa7f52b00… --- diff --git a/src/Makefile b/src/Makefile index 11be15fb2b..a6380c2283 100644 --- a/src/Makefile +++ b/src/Makefile @@ -202,7 +202,7 @@ cmodules=$(foreach mods,$(modules_dirs), $($(mods))) # list of utils directories that should be compiled by make utils -C_COMPILE_UTILS= ../utils/kamcmd +C_COMPILE_UTILS= # kamcmd is now installed by ctl # list of binaries that should be installed alongside # (they should be created after make utils, see C_COMPILE_UTILS) C_INSTALL_BIN= # kamcmd is now installed by ctl

1 0

git:5.5:10cfb3ea: db_perlvdb: removed unnecessary condition
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 10cfb3ea0e80cfbaa5745093d471a58997a633ff URL: https://github.com/kamailio/kamailio/commit/10cfb3ea0e80cfbaa5745093d471a58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:32+01:00 db_perlvdb: removed unnecessary condition (cherry picked from commit d3daed0a617024fde1efabbcdab27dc4c5c140c8) --- Modified: src/modules/db_perlvdb/perlvdb_conv.c --- Diff: https://github.com/kamailio/kamailio/commit/10cfb3ea0e80cfbaa5745093d471a58… Patch: https://github.com/kamailio/kamailio/commit/10cfb3ea0e80cfbaa5745093d471a58… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index f263774658..fcf7b024a5 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -57,9 +57,8 @@ AV *conds2perlarray(const db_key_t* keys, const db_op_t* ops, const db_val_t* va for (i = 0; i < n; i++) { if (ops) { - if (ops + i) - if (*(ops + i)) - element = cond2perlcond(*(keys + i), + if (*(ops + i)) + element = cond2perlcond(*(keys + i), *(ops + i), vals + i); } else { /* OP_EQ is defined in Kamailio _and_ perl. Includes collide :( */

1 0

git:5.5:6c3b7c0e: ims_dialog: updated test conditions
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 6c3b7c0e2ee3e0d397f1781f385eb78483fdd67f URL: https://github.com/kamailio/kamailio/commit/6c3b7c0e2ee3e0d397f1781f385eb78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:49+01:00 ims_dialog: updated test conditions - GH #3014 (cherry picked from commit a8d56242da48708949149c11c06d031b5c2fad49) --- Modified: src/modules/ims_dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/6c3b7c0e2ee3e0d397f1781f385eb78… Patch: https://github.com/kamailio/kamailio/commit/6c3b7c0e2ee3e0d397f1781f385eb78… --- diff --git a/src/modules/ims_dialog/dlg_hash.c b/src/modules/ims_dialog/dlg_hash.c index bc32282d9e..cfe0148e7b 100644 --- a/src/modules/ims_dialog/dlg_hash.c +++ b/src/modules/ims_dialog/dlg_hash.c @@ -253,7 +253,7 @@ void destroy_dlg(struct dlg_cell *dlg) { shm_free(var); } - if (&(dlg->dlg_entry_out)) { + if (dlg->dlg_entry_out.first) { lock_get(dlg->dlg_out_entries_lock); destroy_entry_out(&(dlg->dlg_entry_out)); lock_release(dlg->dlg_out_entries_lock);

1 0

git:5.5:b0a327f7: presence: safety checks for user and domain in ps_ptable_search()
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: b0a327f79d14d1c40742ba1177dd5bdcffc02c6d URL: https://github.com/kamailio/kamailio/commit/b0a327f79d14d1c40742ba1177dd5bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:03:08+01:00 presence: safety checks for user and domain in ps_ptable_search() - GH #3008 (cherry picked from commit c47ec08d8d4a14dc190091ccb79ace62ea6674e3) --- Modified: src/modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/b0a327f79d14d1c40742ba1177dd5bd… Patch: https://github.com/kamailio/kamailio/commit/b0a327f79d14d1c40742ba1177dd5bd… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index c313b01cf0..5d0f0a9568 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -1247,6 +1247,11 @@ ps_presentity_t *ps_ptable_search(ps_presentity_t *ptm, int mmode, int rmode) uint32_t idx = 0; int pmax = 0; + if(ptm->user.s==NULL || ptm->domain.s==NULL) { + LM_WARN("no user or domain for presentity\n"); + return NULL; + } + ptm->hashid = core_case_hash(&ptm->user, &ptm->domain, 0); idx = core_hash_idx(ptm->hashid, _ps_ptable->ssize);

1 0

git:5.5:86c897fa: rls: fixed format-truncation warning GH #3013
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 86c897fac37d2a78b8122b4c62ec87a2371fd9d4 URL: https://github.com/kamailio/kamailio/commit/86c897fac37d2a78b8122b4c62ec87a… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:45+01:00 rls: fixed format-truncation warning GH #3013 (cherry picked from commit e921fc8ed7a6c9fdeb532179a77503cd67799487) --- Modified: src/modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/86c897fac37d2a78b8122b4c62ec87a… Patch: https://github.com/kamailio/kamailio/commit/86c897fac37d2a78b8122b4c62ec87a… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index 19ecce0ca2..63c69a64c6 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -684,8 +684,8 @@ static int child_init(int rank) for (i = 0; i < rls_notifier_processes; i++) { - char tmp[16]; - snprintf(tmp, 16, "RLS NOTIFIER %d", i); + char tmp[25]; + snprintf(tmp, 25, "RLS NOTIFIER %d", i); rls_notifier_id[i] = i; if (fork_basic_utimer(PROC_TIMER, tmp, 1,

1 0

git:5.5:5d05de90: presence: fixed format-truncation warning GH #3013
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 5d05de900de0145a22a5bf044267d9b0c0ceb712 URL: https://github.com/kamailio/kamailio/commit/5d05de900de0145a22a5bf044267d9b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:02+01:00 presence: fixed format-truncation warning GH #3013 (cherry picked from commit c1b14f49ead9a29711cde5334155819cd1c6c90d) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5d05de900de0145a22a5bf044267d9b… Patch: https://github.com/kamailio/kamailio/commit/5d05de900de0145a22a5bf044267d9b… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 09751bbc15..98c0711d0b 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -564,8 +564,8 @@ static int child_init(int rank) int i; for(i = 0; i < pres_notifier_processes; i++) { - char tmp[21]; - snprintf(tmp, 21, "PRESENCE NOTIFIER %d", i); + char tmp[30]; + snprintf(tmp, 30, "PRESENCE NOTIFIER %d", i); pres_notifier_id[i] = i; if(fork_basic_utimer(PROC_TIMER, tmp, 1, pres_timer_send_notify,

1 0

git:5.5:56d9073e: xhttp_pi: wrap freeing and setting to null in curly braces
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 56d9073ef2dd61f6ab48602fe2af77e3c090e290 URL: https://github.com/kamailio/kamailio/commit/56d9073ef2dd61f6ab48602fe2af77e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:02:17+01:00 xhttp_pi: wrap freeing and setting to null in curly braces - GH #3012 (cherry picked from commit 37580a25694d5e5b0b4c89a92d1ba2d8b77aacba) --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/56d9073ef2dd61f6ab48602fe2af77e… Patch: https://github.com/kamailio/kamailio/commit/56d9073ef2dd61f6ab48602fe2af77e… --- diff --git a/src/modules/xhttp_pi/xhttp_pi_fnc.c b/src/modules/xhttp_pi/xhttp_pi_fnc.c index 5610e319bb..f5c2fdd78b 100644 --- a/src/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/src/modules/xhttp_pi/xhttp_pi_fnc.c @@ -2901,7 +2901,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx) case 0: LM_ERR("no record on clause key [%.*s]\n", command->c_keys[0]->len, command->c_keys[0]->s); - if(c_vals) pkg_free(c_vals); c_vals = NULL; + if(c_vals) { pkg_free(c_vals); c_vals = NULL; } goto finish_page; case 1: LM_DBG("got [%d] rows for key [%.*s]\n",

1 0

git:5.5:ba6b3e8d: sms: fixed misleading-indentation warning GH #3012
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: ba6b3e8d8a9cc898e54acf750f871b812911d972 URL: https://github.com/kamailio/kamailio/commit/ba6b3e8d8a9cc898e54acf750f871b8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:01+01:00 sms: fixed misleading-indentation warning GH #3012 (cherry picked from commit adb2d539e0db7feb1d6758dcc040c22a5915f104) --- Modified: src/modules/sms/sms_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/ba6b3e8d8a9cc898e54acf750f871b8… Patch: https://github.com/kamailio/kamailio/commit/ba6b3e8d8a9cc898e54acf750f871b8… --- diff --git a/src/modules/sms/sms_funcs.c b/src/modules/sms/sms_funcs.c index 32efec520c..36b85a964e 100644 --- a/src/modules/sms/sms_funcs.c +++ b/src/modules/sms/sms_funcs.c @@ -883,21 +883,22 @@ void modem_process(struct modem *mdm) /* if any, let's get them */ if (used_mem) LM_DBG("%d new SMS on modem\n",used_mem); - for(i=1,k=1;k<=used_mem && i<=max_mem;i++) { - if (getsms(&sms,mdm,i)!=-1) { - k++; - LM_DBG("SMS Get from location %d\n",i); - /*for test ;-) -> to be remove*/ - LM_DBG("SMS RECEIVED:\n\rFrom: %s %s\n\r%.*s %.*s" - "\n\r\"%.*s\"\n\r",sms.sender,sms.name, - DATE_LEN,sms.date,TIME_LEN,sms.time, - sms.userdatalength,sms.ascii); - if (!sms.is_statusreport) - _send_sms_as_sip(&sms, mdm); - else - check_sms_report(&sms); - } + + for(i=1,k=1;k<=used_mem && i<=max_mem;i++) { + if (getsms(&sms,mdm,i)!=-1) { + k++; + LM_DBG("SMS Get from location %d\n",i); + /*for test ;-) -> to be remove*/ + LM_DBG("SMS RECEIVED:\n\rFrom: %s %s\n\r%.*s %.*s" + "\n\r\"%.*s\"\n\r",sms.sender,sms.name, + DATE_LEN,sms.date,TIME_LEN,sms.time, + sms.userdatalength,sms.ascii); + if (!sms.is_statusreport) + _send_sms_as_sip(&sms, mdm); + else + check_sms_report(&sms); } + } /* if reports are used, checks for expired records in report queue */ if (sms_report_type!=NO_REPORT)

1 0

git:5.5:99b9324f: ims_charging: fixed misleading-indentation warning GH #3012
by Daniel-Constantin Mierla 14 Feb '22

14 Feb '22

Module: kamailio Branch: 5.5 Commit: 99b9324fc2f682288e358304602cdc8fb2bc32a1 URL: https://github.com/kamailio/kamailio/commit/99b9324fc2f682288e358304602cdc8… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-02-14T13:01:12+01:00 ims_charging: fixed misleading-indentation warning GH #3012 (cherry picked from commit d94879b06f9bbb9d6ffa2dcaae5b213f169f2d5a) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/99b9324fc2f682288e358304602cdc8… Patch: https://github.com/kamailio/kamailio/commit/99b9324fc2f682288e358304602cdc8… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 05dc7f29c6..b8c15da445 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1575,23 +1575,23 @@ static int create_cca_result_code(int result) { static int create_cca_fui_avps(int action, str* redirecturi) { int_str action_avp_val, action_avp_name, redirecturi_avp_val, redirecturi_avp_name; - action_avp_name.s.s = RO_AVP_CCA_FUI_ACTION; - action_avp_name.s.len = RO_AVP_CCA_FUI_ACTION_LENGTH; + action_avp_name.s.s = RO_AVP_CCA_FUI_ACTION; + action_avp_name.s.len = RO_AVP_CCA_FUI_ACTION_LENGTH; redirecturi_avp_name.s.s = RO_AVP_CCA_FUI_REDIRECT_URI; - redirecturi_avp_name.s.len = RO_AVP_CCA_FUI_REDIRECT_URI_LENGTH; - char buf[10]; + redirecturi_avp_name.s.len = RO_AVP_CCA_FUI_REDIRECT_URI_LENGTH; + char buf[10]; int rc; - action_avp_val.n = action; - action_avp_val.s.len = snprintf(buf, 10, "%i", action); - action_avp_val.s.s = buf; + action_avp_val.n = action; + action_avp_val.s.len = snprintf(buf, 10, "%i", action); + action_avp_val.s.s = buf; - rc = add_avp(AVP_NAME_STR|AVP_VAL_STR, action_avp_name, action_avp_val); + rc = add_avp(AVP_NAME_STR|AVP_VAL_STR, action_avp_name, action_avp_val); - if (rc < 0) - LM_ERR("Couldn't create ["RO_AVP_CCA_FUI_ACTION"] AVP\n"); - else - LM_DBG("Created AVP ["RO_AVP_CCA_FUI_ACTION"] successfully: value=[%d]\n", action); + if (rc < 0) + LM_ERR("Couldn't create ["RO_AVP_CCA_FUI_ACTION"] AVP\n"); + else + LM_DBG("Created AVP ["RO_AVP_CCA_FUI_ACTION"] successfully: value=[%d]\n", action); if (redirecturi && redirecturi->len >0 && redirecturi->s) { redirecturi_avp_val.s.len = redirecturi->len; @@ -1605,7 +1605,7 @@ static int create_cca_fui_avps(int action, str* redirecturi) { LM_DBG("Created AVP ["RO_AVP_CCA_FUI_REDIRECT_URI"] successfully: value=[%.*s]\n", redirecturi->len, redirecturi->s); } - return 1; + return 1; } static int get_mac_avp_value(struct sip_msg *msg, str *value) {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev