sr-dev December 2020

sr-dev@lists.kamailio.org

18 participants
204 discussions

git:5.4:49d83385: dlgs: fixed return value for dlgs_tags_count()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 49d833852bdcdc7c37ebd8d8d4e8cfb5ef149613 URL: https://github.com/kamailio/kamailio/commit/49d833852bdcdc7c37ebd8d8d4e8cfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-01T09:44:57+01:00 dlgs: fixed return value for dlgs_tags_count() (cherry picked from commit 057383f0b780b8317831f72c7c9f64786cc5a25e) --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/49d833852bdcdc7c37ebd8d8d4e8cfb… Patch: https://github.com/kamailio/kamailio/commit/49d833852bdcdc7c37ebd8d8d4e8cfb… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index c7f60fcab8..503dd8c197 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -341,8 +341,11 @@ static int w_dlgs_tags_rm(sip_msg_t *msg, char *ptags, char *p2) */ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) { - if(dlgs_tags_count(msg, vtags)<0) { - return -1; + int ret; + + ret = dlgs_tags_count(msg, vtags); + if(ret<=0) { + return (ret-1); } return 1; }

3 years, 5 months

git:5.4:3c8d3df4: dlgs: fix counting dialogs function

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 3c8d3df471c92068144f84f2f02b9e79c8c723d2 URL: https://github.com/kamailio/kamailio/commit/3c8d3df471c92068144f84f2f02b9e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-01T09:44:43+01:00 dlgs: fix counting dialogs function - count the dialog in initial state - GH #2568 (cherry picked from commit 6376e24960878ca510ab6f1ce0594a351debc409) --- Modified: src/modules/dlgs/dlgs_mod.c Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/3c8d3df471c92068144f84f2f02b9e7… Patch: https://github.com/kamailio/kamailio/commit/3c8d3df471c92068144f84f2f02b9e7… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index e26e0d9899..c7f60fcab8 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -250,13 +250,16 @@ static int w_dlgs_update(sip_msg_t *msg, char *p1, char *p2) */ static int ki_dlgs_count(sip_msg_t *msg, str *vfield, str *vop, str *vdata) { + int ret; + LM_DBG("counting by: [%.*s] [%.*s] [%.*s]\n", vfield->len, vfield->s, vop->len, vop->s, vdata->len, vdata->s); - if(dlgs_count(msg, vfield, vop, vdata) < 0) { - return -1; + ret = dlgs_count(msg, vfield, vop, vdata); + if(ret <= 0) { + return (ret-1); } - return 1; + return ret; } /** diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index 6b4a6b70e8..1f6af22ba3 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -340,6 +340,7 @@ int dlgs_add_item(sip_msg_t *msg, str *src, str *dst, str *data) prev->next = nitem; } dsht->slots[idx].esize++; + dlgs_update_stats(&dsht->slots[idx].astats, nitem->state, 1); lock_release(&dsht->slots[idx].lock); return 0; }

3 years, 5 months

git:master:057383f0: dlgs: fixed return value for dlgs_tags_count()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 057383f0b780b8317831f72c7c9f64786cc5a25e URL: https://github.com/kamailio/kamailio/commit/057383f0b780b8317831f72c7c9f647… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-12-01T09:40:56+01:00 dlgs: fixed return value for dlgs_tags_count() --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/057383f0b780b8317831f72c7c9f647… Patch: https://github.com/kamailio/kamailio/commit/057383f0b780b8317831f72c7c9f647… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index c7f60fcab8..503dd8c197 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -341,8 +341,11 @@ static int w_dlgs_tags_rm(sip_msg_t *msg, char *ptags, char *p2) */ static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags) { - if(dlgs_tags_count(msg, vtags)<0) { - return -1; + int ret; + + ret = dlgs_tags_count(msg, vtags); + if(ret<=0) { + return (ret-1); } return 1; }

3 years, 5 months

git:master:a12029cd: tm: some more cleanups regarding logging (remove double log level or function)

by Henning Westerholt

Module: kamailio Branch: master Commit: a12029cd2b4a9153851496fb2999b89875b5b495 URL: https://github.com/kamailio/kamailio/commit/a12029cd2b4a9153851496fb2999b89… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-12-01T08:28:51Z tm: some more cleanups regarding logging (remove double log level or function) --- Modified: src/modules/tm/lock.c Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/a12029cd2b4a9153851496fb2999b89… Patch: https://github.com/kamailio/kamailio/commit/a12029cd2b4a9153851496fb2999b89… --- diff --git a/src/modules/tm/lock.c b/src/modules/tm/lock.c index c06bd4c16a..ed7de0c971 100644 --- a/src/modules/tm/lock.c +++ b/src/modules/tm/lock.c @@ -80,8 +80,7 @@ int lock_initialize() lock_set_dealloc(reply_semaphore); } if(i == 0) { - LOG(L_CRIT, "lock_initialize: could not allocate semaphore" - " sets\n"); + LOG(L_CRIT, "could not allocate semaphore sets\n"); goto error; } diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index dadfaa6b08..4ccdee7574 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1067,8 +1067,7 @@ int t_check_msg( struct sip_msg* p_msg , int *param_branch ) if (cfg_get(tm, tm_cfg, tm_aggregate_auth) && (p_msg->REPLY_STATUS==401 || p_msg->REPLY_STATUS==407)){ if (parse_headers(p_msg, HDR_EOH_F,0)==-1){ - LM_WARN("WARNING: the reply cannot be " - "completely parsed\n"); + LM_WARN("the reply cannot be completely parsed\n"); /* try to continue, via1 & cseq are checked below */ } }else if ( parse_headers(p_msg, HDR_VIA1_F|HDR_CSEQ_F|HDR_CALLID_F, diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index cda84b6f5d..47f94c1697 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -484,7 +484,7 @@ char *build_local_reparse(tm_cell_t *Trans,unsigned int branch, /* final (end-of-headers) CRLF */ append_str(d, CRLF, CRLF_LEN); *len = d - cancel_buf; - /* LOG(L_DBG, "DBG: build_local: %.*s\n", *len, cancel_buf); */ + /* LOG(L_DBG, "%.*s\n", *len, cancel_buf); */ return cancel_buf; default: diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 481a4a00f8..51b669f776 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1666,8 +1666,7 @@ int t_retransmit_reply( struct cell *t ) * the chances for this increase a lot. */ if (!t->uas.response.dst.send_sock) { - LOG(L_WARN, "WARNING: t_retransmit_reply: " - "no resolved dst to retransmit\n"); + LOG(L_WARN, "no resolved dst to retransmit\n"); return -1; } @@ -1677,14 +1676,13 @@ int t_retransmit_reply( struct cell *t ) LOCK_REPLIES( t ); if (!t->uas.response.buffer) { - DBG("DBG: t_retransmit_reply: nothing to retransmit\n"); + DBG("nothing to retransmit\n"); goto error; } len=t->uas.response.buffer_len; if ( len==0 || len>BUF_SIZE ) { - DBG("DBG: t_retransmit_reply: " - "zero length or too big to retransmit: %d\n", len); + DBG("zero length or too big to retransmit: %d\n", len); goto error; } memcpy( b, t->uas.response.buffer, len );

3 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2020