sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
417 discussions

git:5.2:65981020: Revert "pv: print missing types for xavp values"

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 659810200f4fc60da12b2633489e81e10dc7a565 URL: https://github.com/kamailio/kamailio/commit/659810200f4fc60da12b2633489e81e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-23T15:55:04+01:00 Revert "pv: print missing types for xavp values" This reverts commit f17353dfbf7fc42b2d070bdc45a3b72278202a08. --- Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/659810200f4fc60da12b2633489e81e… Patch: https://github.com/kamailio/kamailio/commit/659810200f4fc60da12b2633489e81e… --- diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 7bad3be885..c36a6c6f1f 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -60,14 +60,6 @@ int pv_xavp_get_value(struct sip_msg *msg, pv_param_t *param, if(snprintf(_pv_xavp_buf, 128, "<<xavp:%p>>", avp->val.v.xavp)<0) return pv_get_null(msg, param, res); break; - case SR_XTYPE_VPTR: - if(snprintf(_pv_xavp_buf, 128, "<<vptr:%p>>", avp->val.v.vptr)<0) - return pv_get_null(msg, param, res); - break; - case SR_XTYPE_SPTR: - if(snprintf(_pv_xavp_buf, 128, "<<sptr:%p>>", avp->val.v.vptr)<0) - return pv_get_null(msg, param, res); - break; case SR_XTYPE_DATA: if(snprintf(_pv_xavp_buf, 128, "<<data:%p>>", avp->val.v.data)<0) return pv_get_null(msg, param, res);

4 years, 9 months

git:5.2:57198b5f: utils/kamctl: update shebang to python3

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 57198b5fb3ee5376ee94761e8735a38b855ee13e URL: https://github.com/kamailio/kamailio/commit/57198b5fb3ee5376ee94761e8735a38… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-23T15:53:22+01:00 utils/kamctl: update shebang to python3 (cherry picked from commit 9aa42d7c8161d4a0d085b019a85cde6981b3b4f9) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/57198b5fb3ee5376ee94761e8735a38… Patch: https://github.com/kamailio/kamailio/commit/57198b5fb3ee5376ee94761e8735a38… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index b3531c88c6..3a35554013 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # Copyright 2008 Google Inc. All Rights Reserved.

4 years, 9 months

git:5.2:8f2552a6: domain: fix spelling error

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 8f2552a6d517c598058e94d862cbfb62c1e67ef0 URL: https://github.com/kamailio/kamailio/commit/8f2552a6d517c598058e94d862cbfb6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-23T15:53:22+01:00 domain: fix spelling error (cherry picked from commit 0944689db2eabbb531fc6daed9db3a9bcc1780b6) --- Modified: src/modules/domain/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/8f2552a6d517c598058e94d862cbfb6… Patch: https://github.com/kamailio/kamailio/commit/8f2552a6d517c598058e94d862cbfb6… --- diff --git a/src/modules/domain/hash.c b/src/modules/domain/hash.c index b093dbc3e4..4cb968e458 100644 --- a/src/modules/domain/hash.c +++ b/src/modules/domain/hash.c @@ -137,7 +137,7 @@ int hash_table_install(struct domain_list **hash_table, str *did, str *domain) np->did.len = did->len; np->did.s = (char *)shm_malloc(did->len); if(np->did.s == NULL) { - LM_ERR("no shared memeory for did\n"); + LM_ERR("no shared memory for did\n"); shm_free(np); return -1; } @@ -210,4 +210,4 @@ void hash_table_free(struct domain_list **hash_table) hash_table[DOM_HASH_SIZE] = NULL; return; -} \ No newline at end of file +}

4 years, 9 months

git:5.2:766b993b: seas: fix spelling error

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 766b993b78e38f4aa108b6ec901cecbd9c938fbc URL: https://github.com/kamailio/kamailio/commit/766b993b78e38f4aa108b6ec901cecb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-23T15:53:22+01:00 seas: fix spelling error (cherry picked from commit 8a197dcc8d2d063d3615e8800ed8d2f7812cce0f) --- Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/seas/event_dispatcher.h --- Diff: https://github.com/kamailio/kamailio/commit/766b993b78e38f4aa108b6ec901cecb… Patch: https://github.com/kamailio/kamailio/commit/766b993b78e38f4aa108b6ec901cecb…

4 years, 9 months

git:5.2:edbe9933: smsops: fix spelling error

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: edbe99332af576b8c860c9d887e3eb1c51c9b6db URL: https://github.com/kamailio/kamailio/commit/edbe99332af576b8c860c9d887e3eb1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-23T15:53:22+01:00 smsops: fix spelling error (cherry picked from commit 4a657005a5c4eff88e48dc2b8847d5800a90bead) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/edbe99332af576b8c860c9d887e3eb1… Patch: https://github.com/kamailio/kamailio/commit/edbe99332af576b8c860c9d887e3eb1… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index b5eef0a593..d686c2ea78 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -543,7 +543,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Check for malicious length, which might cause buffer overflow if(udh_len > body.len - p) { - LM_ERR("TP-User-Data-Lenght is bigger than the remaining message buffer!\n"); + LM_ERR("TP-User-Data-Length is bigger than the remaining message buffer!\n"); return -1; } @@ -564,7 +564,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { // Check for malicious length, which might cause buffer overflow if(udh_read + ie->data.len + 2 /* two octets are read so far */ > udh_len) { - LM_ERR("IE Lenght for IE id %d is bigger than the remaining User-Data element!\n", + LM_ERR("IE Length for IE id %d is bigger than the remaining User-Data element!\n", ie->identifier); pkg_free(ie); return -1;

4 years, 9 months

git:5.2:abb94a67: smsops: fix spelling error

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: abb94a6747f24c2d89e9c3f6afc6615e44fea120 URL: https://github.com/kamailio/kamailio/commit/abb94a6747f24c2d89e9c3f6afc6615… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-23T15:53:22+01:00 smsops: fix spelling error (cherry picked from commit 4ba14d2f6db6144870650398da6c07b07d23d64d) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/abb94a6747f24c2d89e9c3f6afc6615… Patch: https://github.com/kamailio/kamailio/commit/abb94a6747f24c2d89e9c3f6afc6615… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 8df667bb77..b5eef0a593 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -573,7 +573,7 @@ int decode_3gpp_sms(struct sip_msg *msg) { if(ie->identifier == TP_UDH_IE_CONCAT_SM_8BIT_REF) { if(contains_8bit_refnum) { pkg_free(ie); - LM_ERR("IE Concatenated Short Message 8bit Reference occured more than once in UDH\n"); + LM_ERR("IE Concatenated Short Message 8bit Reference occurred more than once in UDH\n"); return -1; }

4 years, 9 months

git:5.2:d79c2c37: pua: fix spelling error

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: d79c2c37acd0c5660cfc4d36d7e0e801f8da8d59 URL: https://github.com/kamailio/kamailio/commit/d79c2c37acd0c5660cfc4d36d7e0e80… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-23T15:53:22+01:00 pua: fix spelling error (cherry picked from commit d06e85d6fa9e75e8008bc422a7596671283054f7) --- Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/d79c2c37acd0c5660cfc4d36d7e0e80… Patch: https://github.com/kamailio/kamailio/commit/d79c2c37acd0c5660cfc4d36d7e0e80… --- diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index 254e77e7fd..fd13836391 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -669,7 +669,7 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) { LM_DBG("BLA_SUBSCRIBE FLAG inserted\n"); } - LM_DBG("record for subscribe from %.*s to %.*s inserted in datatbase\n", + LM_DBG("record for subscribe from %.*s to %.*s inserted in database\n", presentity->watcher_uri->len, presentity->watcher_uri->s, presentity->pres_uri->len, presentity->pres_uri->s);

4 years, 9 months

git:5.2:8ea6d736: core: fix spelling error

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 8ea6d73689b954f2ae60261075b232d09401c525 URL: https://github.com/kamailio/kamailio/commit/8ea6d73689b954f2ae60261075b232d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-23T15:53:22+01:00 core: fix spelling error (cherry picked from commit e35fe2d7b4ae79be6af9a70d8520620941960a72) --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/8ea6d73689b954f2ae60261075b232d… Patch: https://github.com/kamailio/kamailio/commit/8ea6d73689b954f2ae60261075b232d… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 844247faa5..c7a09678ff 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -243,7 +243,7 @@ void pp_define_core(void) n = snprintf(p, 64 - (int)(p-defval), "_%d", VERSIONVAL/1000000); if(n<0 || n>=64 - (int)(p-defval)) { - LM_ERR("faild to build define token\n"); + LM_ERR("failed to build define token\n"); return; } pp_define_set_type(0); @@ -255,7 +255,7 @@ void pp_define_core(void) n = snprintf(p, 64 - (int)(p-defval), "_%d_%d", VERSIONVAL/1000000, (VERSIONVAL%1000000)/1000); if(n<0 || n>=64 - (int)(p-defval)) { - LM_ERR("faild to build define token\n"); + LM_ERR("failed to build define token\n"); return; } pp_define_set_type(0); @@ -267,7 +267,7 @@ void pp_define_core(void) n = snprintf(p, 64 - (int)(p-defval), "_%d_%d_%d", VERSIONVAL/1000000, (VERSIONVAL%1000000)/1000, VERSIONVAL%1000); if(n<0 || n>=64 - (int)(p-defval)) { - LM_ERR("faild to build define token\n"); + LM_ERR("failed to build define token\n"); return; } pp_define_set_type(0);

4 years, 9 months

git:5.2:97627793: acc: better evaluation of error return for pv_printf_s()

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 97627793db2963704202f252d45821d8c05acc1b URL: https://github.com/kamailio/kamailio/commit/97627793db2963704202f252d45821d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-23T15:53:22+01:00 acc: better evaluation of error return for pv_printf_s() (cherry picked from commit 69ccdc25fbfaf01785127ecb051429e51df6cad5) --- Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/97627793db2963704202f252d45821d… Patch: https://github.com/kamailio/kamailio/commit/97627793db2963704202f252d45821d… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index cc66bc67df..4ccf75e653 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -178,7 +178,7 @@ int acc_parse_code(char *p, struct acc_param *param) int acc_get_param_value(struct sip_msg *rq, struct acc_param *param) { if(param->elem!=NULL) { - if(pv_printf_s(rq, param->elem, &param->reason)==-1) { + if(pv_printf_s(rq, param->elem, &param->reason)<0) { LM_ERR("Can't get value for %.*s\n", param->reason.len, param->reason.s); return -1; }

4 years, 9 months

git:5.2:f7c990e2: core: qmalloc - print details of prev fragment when its tail is overwritten

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: f7c990e2ca6c7b2d43cf15723c71ba38065236e8 URL: https://github.com/kamailio/kamailio/commit/f7c990e2ca6c7b2d43cf15723c71ba3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-23T15:53:22+01:00 core: qmalloc - print details of prev fragment when its tail is overwritten - do it when check2 field is not touched (cherry picked from commit bf1ba8d2d4519af50d44acfce5f34535fd1db8e0) --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/f7c990e2ca6c7b2d43cf15723c71ba3… Patch: https://github.com/kamailio/kamailio/commit/f7c990e2ca6c7b2d43cf15723c71ba3… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 52d2ef722c..47d8344bd1 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -118,6 +118,7 @@ static void qm_debug_check_frag(struct qm_block* qm, struct qm_frag* f, const char* file, unsigned int line, const char* efile, unsigned int eline) { + struct qm_frag *p; if (f->check!=ST_CHECK_PATTERN){ LM_CRIT("BUG: qm: fragm. %p (address %p) " "beginning overwritten (%lx)! Memory allocator was called " @@ -147,6 +148,12 @@ static void qm_debug_check_frag(struct qm_block* qm, struct qm_frag* f, PREV_FRAG_END(f)->check1, PREV_FRAG_END(f)->check2, f, (char*)f+sizeof(struct qm_frag), file, line, f->file, f->line, efile, eline); + if(PREV_FRAG_END(f)->check2==END_CHECK_PATTERN2) { + p = FRAG_PREV(f); + LM_CRIT("BUG: qm: prev. fragm. tail overwritten [%p:%p]" + " - fragment marked by %s:%lu\n", p, + (char*)p+sizeof(struct qm_frag), p->file, p->line); + } qm_status(qm); abort(); }

4 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020