sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
306 discussions

git:master:8cd0a5ab: misctest: info debug about input data

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8cd0a5ab8683c7a598499e6b1bbe1fc6a489f531 URL: https://github.com/kamailio/kamailio/commit/8cd0a5ab8683c7a598499e6b1bbe1fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T14:59:21+02:00 misctest: info debug about input data --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8cd0a5ab8683c7a598499e6b1bbe1fc… Patch: https://github.com/kamailio/kamailio/commit/8cd0a5ab8683c7a598499e6b1bbe1fc… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index c8fe64a56c..2b304c6b5d 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -312,37 +312,38 @@ static int misctest_message_init(void) return -1; } - tmsg.buf = tbuf; + tmsg.buf = tbuf; - LM_INFO("using data: [[%.*s]] (%d)\n", tmsg.len, tmsg.buf, tmsg.len); + LM_INFO("data - start: %p - end: %p - len: %d\n", tmsg.buf, + tmsg.buf + tmsg.len, tmsg.len); + LM_INFO("data - content: [[%.*s]]\n", tmsg.len, tmsg.buf); misctest_hexprint(tmsg.buf, tmsg.len, 20, 10); - if (parse_msg(tmsg.buf, tmsg.len, &tmsg) < 0) { - goto cleanup; - } + if (parse_msg(tmsg.buf, tmsg.len, &tmsg) < 0) { + goto cleanup; + } - parse_sdp(&tmsg); + parse_sdp(&tmsg); - parse_headers(&tmsg, HDR_TO_F, 0); + parse_headers(&tmsg, HDR_TO_F, 0); - parse_contact_header(&tmsg); + parse_contact_header(&tmsg); - parse_refer_to_header(&tmsg); + parse_refer_to_header(&tmsg); - parse_to_header(&tmsg); + parse_to_header(&tmsg); - parse_pai_header(&tmsg); + parse_pai_header(&tmsg); - parse_diversion_header(&tmsg); + parse_diversion_header(&tmsg); - parse_privacy(&tmsg); + parse_privacy(&tmsg); cleanup: - free_sip_msg(&tmsg); - - return 0; + free_sip_msg(&tmsg); + return 0; } /**

3 years, 3 months

git:5.5:1685ebd5: usrloc: set tcp connection id to -1 for records added via rpc

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 1685ebd5917e763c347b6d4201b19b72e2ee274e URL: https://github.com/kamailio/kamailio/commit/1685ebd5917e763c347b6d4201b19b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T13:33:46+02:00 usrloc: set tcp connection id to -1 for records added via rpc - cope properly with the handle_lost_tcp modparam (cherry picked from commit a0a97119bef7671f33734399dc9de4562abae39c) --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/1685ebd5917e763c347b6d4201b19b7… Patch: https://github.com/kamailio/kamailio/commit/1685ebd5917e763c347b6d4201b19b7… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index d45a8e2783..6565b07d5c 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -678,6 +678,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } ci.ruid = _ul_sruid.uid; ci.server_id = server_id; + ci.tcpconn_id = -1; lock_udomain(dom, &aor);

3 years, 3 months

git:5.5:b0125b66: presence: skip body operations on empty string

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b0125b66116468b1e5d0dd2ee4eb0eebb4e7ecb4 URL: https://github.com/kamailio/kamailio/commit/b0125b66116468b1e5d0dd2ee4eb0ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:33:35+02:00 presence: skip body operations on empty string (cherry picked from commit c849070371740c01f9f13a889c610de9132349f3) --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/b0125b66116468b1e5d0dd2ee4eb0ee… Patch: https://github.com/kamailio/kamailio/commit/b0125b66116468b1e5d0dd2ee4eb0ee… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 87ed58cff4..cf52c21c22 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1700,7 +1700,8 @@ int send_notify_request( } /* build extra headers */ - if(build_str_hdr(subs, notify_body ? 1 : 0, &str_hdr) < 0) { + if(build_str_hdr(subs, (notify_body && notify_body->len>0) ? 1 : 0, + &str_hdr) < 0) { LM_ERR("while building headers\n"); goto error; } diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 8dd7c99fe8..83a88f1aa1 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -303,6 +303,9 @@ int pres_dmq_handle_msg( } else if(strcmp(it->string, "body") == 0) { p_body.s = it->valuestring; p_body.len = strlen(it->valuestring); + if(p_body.len==0) { + p_body.s = NULL; + } } else { LM_ERR("unrecognized field in json object\n"); goto invalid; diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index bc17bf1074..a7629a4e92 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -737,6 +737,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, result_cols[rez_ruid_col = n_result_cols++] = &str_ruid_col; if(new_t) { + /* new_t!=0 */ LM_DBG("new presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); @@ -888,6 +889,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, *sent_reply = 1; goto send_notify; } else { + /* new_t==0 */ LM_DBG("updating existing presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); @@ -1206,7 +1208,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, update_vals[n_update_cols].val.int_val = presentity->priority; n_update_cols++; - if(body && body->s) { + if(body && body->s && body->len>0) { update_keys[n_update_cols] = &str_body_col; update_vals[n_update_cols].type = DB1_BLOB; update_vals[n_update_cols].nul = 0; @@ -1748,7 +1750,7 @@ static int ps_cache_update_presentity(sip_msg_t *msg, presentity_t *presentity, ptc.expires = presentity->expires + (int)time(NULL); ptc.received_time = presentity->received_time; ptc.priority = presentity->priority; - if(body && body->s) { + if(body && body->s && body->len>0) { ptc.body = *body; } if(presentity->sender) {

3 years, 3 months

git:5.5:d96e3527: tm: skip body operation on empty string for uac building

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: d96e3527c20791cb2291aa91685d5bc85606eb56 URL: https://github.com/kamailio/kamailio/commit/d96e3527c20791cb2291aa91685d5bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:33:21+02:00 tm: skip body operation on empty string for uac building (cherry picked from commit 34b61d3f1d6b5a0d4425f8edfa69d707cfa058b7) --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/d96e3527c20791cb2291aa91685d5bc… Patch: https://github.com/kamailio/kamailio/commit/d96e3527c20791cb2291aa91685d5bc… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index ef9b45e246..27aaef9b5f 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1637,7 +1637,7 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, memapp(w, CRLF, CRLF_LEN); } memapp(w, CRLF, CRLF_LEN); - if (body) memapp(w, body->s, body->len); + if (body && body->s && body->len>0) memapp(w, body->s, body->len); #ifdef EXTRA_DEBUG assert(w-buf == *len);

3 years, 3 months

git:5.5:b6380374: sca: call unsafe find entry function to avoid infinite recursion

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b6380374f310a26c8a36f807d97ff0f415204be4 URL: https://github.com/kamailio/kamailio/commit/b6380374f310a26c8a36f807d97ff0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:32:58+02:00 sca: call unsafe find entry function to avoid infinite recursion (cherry picked from commit bd92fb59cce183008956ff060911cc14d3dfb160) --- Modified: src/modules/sca/sca_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/b6380374f310a26c8a36f807d97ff0f… Patch: https://github.com/kamailio/kamailio/commit/b6380374f310a26c8a36f807d97ff0f… --- diff --git a/src/modules/sca/sca_hash.c b/src/modules/sca/sca_hash.c index 3e96bc2be5..690e9a39e5 100644 --- a/src/modules/sca/sca_hash.c +++ b/src/modules/sca/sca_hash.c @@ -205,7 +205,7 @@ sca_hash_entry *sca_hash_table_slot_kv_find_entry(sca_hash_slot *slot, str *key) sca_hash_entry *e; lock_get(&slot->lock); - e = sca_hash_table_slot_kv_find_entry(slot, key); + e = sca_hash_table_slot_kv_find_entry_unsafe(slot, key); lock_release(&slot->lock); return (e);

3 years, 3 months

git:5.5:0c9d7e33: dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 0c9d7e3378a4e3ffb1e6a7e48f89b7649aaa6fb2 URL: https://github.com/kamailio/kamailio/commit/0c9d7e3378a4e3ffb1e6a7e48f89b76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:32:45+02:00 dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW (cherry picked from commit b86d2490f3b96c532cbe07259786757b3ab9fc02) --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/0c9d7e3378a4e3ffb1e6a7e48f89b76… Patch: https://github.com/kamailio/kamailio/commit/0c9d7e3378a4e3ffb1e6a7e48f89b76… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7e5b00425b..243bb9bd9f 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2706,7 +2706,7 @@ static void rpc_dlg_set_state(rpc_t *rpc,void *c){ dlg->init_ts = (unsigned int)(time(0)); dlg->end_ts = (unsigned int)(time(0)); } - dlg->dflags |= DLG_FLAG_NEW; + dlg->dflags |= DLG_FLAG_CHANGED; dlg_unref(dlg, unref);

3 years, 3 months

git:5.5:5dbf99eb: ndb_redis: fix SIGSEGV in redisc_check_auth

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 5dbf99eb03aba76905aa926a55aedd3caa0fcd05 URL: https://github.com/kamailio/kamailio/commit/5dbf99eb03aba76905aa926a55aedd3… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:30:30+02:00 ndb_redis: fix SIGSEGV in redisc_check_auth - Added the check for NULL pointer. When TCP session to redis reset, redisCommand function can return NULL pointer. (cherry picked from commit c32a0be89cc92a0649277774d1e7aebf349b8b49) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/5dbf99eb03aba76905aa926a55aedd3… Patch: https://github.com/kamailio/kamailio/commit/5dbf99eb03aba76905aa926a55aedd3… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index befb69ab79..bb6adc20b1 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1269,6 +1269,10 @@ int redisc_check_auth(redisc_server_t *rsrv, char *pass) int retval = 0; reply = redisCommand(rsrv->ctxRedis, "AUTH %s", pass); + if(!reply) { + LM_ERR("Redis authentication error\n"); + return -1; + } if (reply->type == REDIS_REPLY_ERROR) { LM_ERR("Redis authentication error\n"); retval = -1;

3 years, 3 months

git:master:c8490703: presence: skip body operations on empty string

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c849070371740c01f9f13a889c610de9132349f3 URL: https://github.com/kamailio/kamailio/commit/c849070371740c01f9f13a889c610de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:27:01+02:00 presence: skip body operations on empty string --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/c849070371740c01f9f13a889c610de… Patch: https://github.com/kamailio/kamailio/commit/c849070371740c01f9f13a889c610de… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 87ed58cff4..cf52c21c22 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1700,7 +1700,8 @@ int send_notify_request( } /* build extra headers */ - if(build_str_hdr(subs, notify_body ? 1 : 0, &str_hdr) < 0) { + if(build_str_hdr(subs, (notify_body && notify_body->len>0) ? 1 : 0, + &str_hdr) < 0) { LM_ERR("while building headers\n"); goto error; } diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 8dd7c99fe8..83a88f1aa1 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -303,6 +303,9 @@ int pres_dmq_handle_msg( } else if(strcmp(it->string, "body") == 0) { p_body.s = it->valuestring; p_body.len = strlen(it->valuestring); + if(p_body.len==0) { + p_body.s = NULL; + } } else { LM_ERR("unrecognized field in json object\n"); goto invalid; diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index bc17bf1074..a7629a4e92 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -737,6 +737,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, result_cols[rez_ruid_col = n_result_cols++] = &str_ruid_col; if(new_t) { + /* new_t!=0 */ LM_DBG("new presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); @@ -888,6 +889,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, *sent_reply = 1; goto send_notify; } else { + /* new_t==0 */ LM_DBG("updating existing presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); @@ -1206,7 +1208,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, update_vals[n_update_cols].val.int_val = presentity->priority; n_update_cols++; - if(body && body->s) { + if(body && body->s && body->len>0) { update_keys[n_update_cols] = &str_body_col; update_vals[n_update_cols].type = DB1_BLOB; update_vals[n_update_cols].nul = 0; @@ -1748,7 +1750,7 @@ static int ps_cache_update_presentity(sip_msg_t *msg, presentity_t *presentity, ptc.expires = presentity->expires + (int)time(NULL); ptc.received_time = presentity->received_time; ptc.priority = presentity->priority; - if(body && body->s) { + if(body && body->s && body->len>0) { ptc.body = *body; } if(presentity->sender) {

3 years, 3 months

git:master:34b61d3f: tm: skip body operation on empty string for uac building

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 34b61d3f1d6b5a0d4425f8edfa69d707cfa058b7 URL: https://github.com/kamailio/kamailio/commit/34b61d3f1d6b5a0d4425f8edfa69d70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:25:29+02:00 tm: skip body operation on empty string for uac building --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/34b61d3f1d6b5a0d4425f8edfa69d70… Patch: https://github.com/kamailio/kamailio/commit/34b61d3f1d6b5a0d4425f8edfa69d70… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index ef9b45e246..27aaef9b5f 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1637,7 +1637,7 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, memapp(w, CRLF, CRLF_LEN); } memapp(w, CRLF, CRLF_LEN); - if (body) memapp(w, body->s, body->len); + if (body && body->s && body->len>0) memapp(w, body->s, body->len); #ifdef EXTRA_DEBUG assert(w-buf == *len);

3 years, 3 months

git:master:a0a97119: usrloc: set tcp connection id to -1 for records added via rpc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a0a97119bef7671f33734399dc9de4562abae39c URL: https://github.com/kamailio/kamailio/commit/a0a97119bef7671f33734399dc9de45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T09:11:06+02:00 usrloc: set tcp connection id to -1 for records added via rpc - cope properly with the handle_lost_tcp modparam --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/a0a97119bef7671f33734399dc9de45… Patch: https://github.com/kamailio/kamailio/commit/a0a97119bef7671f33734399dc9de45… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index d45a8e2783..6565b07d5c 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -678,6 +678,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } ci.ruid = _ul_sruid.uid; ci.server_id = server_id; + ci.tcpconn_id = -1; lock_udomain(dom, &aor);

3 years, 3 months

← Newer
1
...
21
22
23
24
25
26
27
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2021