sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
306 discussions

git:master:17a2eec2: core: parse_to_param() check for end of data on escape or start of value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 17a2eec2a8e47939782c1352ddb0fa4d3e73f9d8 URL: https://github.com/kamailio/kamailio/commit/17a2eec2a8e47939782c1352ddb0fa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T09:05:54+02:00 core: parse_to_param() check for end of data on escape or start of value --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/17a2eec2a8e47939782c1352ddb0fa4… Patch: https://github.com/kamailio/kamailio/commit/17a2eec2a8e47939782c1352ddb0fa4… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 0b8cddc8e2..99138dcaf4 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -225,6 +225,12 @@ static char *parse_to_param(char *const buffer, const char *const end, case '\\': switch(status) { case PARA_VALUE_QUOTED: + if(tmp+1>=end) { + LM_ERR("unexpected end of data in status %d - start: %p" + " - end: %p - crt: %p\n", + status, buffer, end , tmp); + goto error; + } switch(*(tmp + 1)) { case '\r': case '\n': @@ -241,6 +247,12 @@ static char *parse_to_param(char *const buffer, const char *const end, case '"': switch(status) { case S_PARA_VALUE: + if(tmp+1>=end) { + LM_ERR("unexpected end of data in status %d - start: %p" + " - end: %p - crt: %p\n", + status, buffer, end , tmp); + goto error; + } param->value.s = tmp + 1; status = PARA_VALUE_QUOTED; break;

3 years, 3 months

git:master:f624e170: core: parser - free unlinked local param structure in parse_to_param()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f624e1701088a94465a06f36a2ef27804b16ec0e URL: https://github.com/kamailio/kamailio/commit/f624e1701088a94465a06f36a2ef278… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T14:57:52+02:00 core: parser - free unlinked local param structure in parse_to_param() --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/f624e1701088a94465a06f36a2ef278… Patch: https://github.com/kamailio/kamailio/commit/f624e1701088a94465a06f36a2ef278… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 604791c7b0..0b8cddc8e2 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -281,6 +281,10 @@ static char *parse_to_param(char *const buffer, const char *const end, semicolon_add_param: add_param(param, to_b, newparam); case E_PARA_VALUE: + if(newparam) { + pkg_free(newparam); + newparam = NULL; + } param = (struct to_param *)pkg_malloc( sizeof(struct to_param)); if(!param) {

3 years, 3 months

git:master:bd92fb59: sca: call unsafe find entry function to avoid infinite recursion

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bd92fb59cce183008956ff060911cc14d3dfb160 URL: https://github.com/kamailio/kamailio/commit/bd92fb59cce183008956ff060911cc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T13:30:31+02:00 sca: call unsafe find entry function to avoid infinite recursion --- Modified: src/modules/sca/sca_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/bd92fb59cce183008956ff060911cc1… Patch: https://github.com/kamailio/kamailio/commit/bd92fb59cce183008956ff060911cc1… --- 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:master:d0b1d4b2: misctest: print input data in hex format

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d0b1d4b255c2ec4ad9d7e9505b70453bc6376163 URL: https://github.com/kamailio/kamailio/commit/d0b1d4b255c2ec4ad9d7e9505b70453… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T10:00:56+02:00 misctest: print input data in hex format --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d0b1d4b255c2ec4ad9d7e9505b70453… Patch: https://github.com/kamailio/kamailio/commit/d0b1d4b255c2ec4ad9d7e9505b70453… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index f942063225..c8fe64a56c 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -53,6 +53,7 @@ static void mod_destroy(void); static int misctest_memory_init(void); static int misctest_message_init(void); +int misctest_hexprint(void *data, size_t length, int linelen, int split); static int misctest_memory = 0; static int misctest_message = 0; @@ -313,7 +314,9 @@ static int misctest_message_init(void) tmsg.buf = tbuf; - LM_INFO("using data: [[%.*s]]\n", tmsg.len, tmsg.buf); + LM_INFO("using data: [[%.*s]] (%d)\n", tmsg.len, tmsg.buf, tmsg.len); + + misctest_hexprint(tmsg.buf, tmsg.len, 20, 10); if (parse_msg(tmsg.buf, tmsg.len, &tmsg) < 0) { goto cleanup; @@ -342,6 +345,90 @@ static int misctest_message_init(void) } +/** + * misctest_hexprint - output a hex dump of a buffer + * + * data - pointer to the buffer + * length - length of buffer to write + * linelen - number of chars to output per line + * split - number of chars in each chunk on a line + */ + +int misctest_hexprint(void *data, size_t length, int linelen, int split) +{ + char buffer[512]; + char *ptr; + const void *inptr; + int pos; + int remaining = length; + + inptr = data; + + if(sizeof(buffer) <= (3 + (4 * (linelen / split)) + (linelen * 4))) { + LM_ERR("buffer size is too small\n"); + return -1; + } + + while (remaining > 0) { + int lrem; + int splitcount; + ptr = buffer; + + lrem = remaining; + splitcount = 0; + for (pos = 0; pos < linelen; pos++) { + + if (split == splitcount++) { + sprintf(ptr, " "); + ptr += 2; + splitcount = 1; + } + + if (lrem) { + sprintf(ptr, "%0.2x ", *((unsigned char *) inptr + pos)); + lrem--; + } else { + sprintf(ptr, " "); + } + ptr += 3; + } + + *ptr++ = ' '; + *ptr++ = ' '; + + lrem = remaining; + splitcount = 0; + for (pos = 0; pos < linelen; pos++) { + unsigned char c; + + if (split == splitcount++) { + sprintf(ptr, " "); + ptr += 2; + splitcount = 1; + } + + if (lrem) { + c = *((unsigned char *) inptr + pos); + if (c > 31 && c < 127) { + sprintf(ptr, "%c", c); + } else { + sprintf(ptr, "."); + } + lrem--; + } + ptr++; + } + + *ptr = '\0'; + LM_INFO("%s\n", buffer); + + inptr += linelen; + remaining -= linelen; + } + + return 0; +} + /** record a memory chunk list entry. * @param addr - address of the newly allocated memory * @oaram size - size

3 years, 3 months

git:master:b86d2490: dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b86d2490f3b96c532cbe07259786757b3ab9fc02 URL: https://github.com/kamailio/kamailio/commit/b86d2490f3b96c532cbe07259786757… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T10:00:56+02:00 dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/b86d2490f3b96c532cbe07259786757… Patch: https://github.com/kamailio/kamailio/commit/b86d2490f3b96c532cbe07259786757… --- 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:master:a2511df2: core: log unexpected char in parse_param2()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a2511df29adc83544f047cbbdba7a8ba88272930 URL: https://github.com/kamailio/kamailio/commit/a2511df29adc83544f047cbbdba7a8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T10:00:56+02:00 core: log unexpected char in parse_param2() --- Modified: src/core/parser/parse_param.c --- Diff: https://github.com/kamailio/kamailio/commit/a2511df29adc83544f047cbbdba7a8b… Patch: https://github.com/kamailio/kamailio/commit/a2511df29adc83544f047cbbdba7a8b… --- diff --git a/src/core/parser/parse_param.c b/src/core/parser/parse_param.c index 5452cbe50b..8436e0db23 100644 --- a/src/core/parser/parse_param.c +++ b/src/core/parser/parse_param.c @@ -514,7 +514,7 @@ static inline int parse_param2( goto ok; /* To be able to parse URI parameters */ if(_s->s[0] != separator) { - LM_ERR("Invalid character, %c expected\n", separator); + LM_ERR("Invalid character '%c' - expected '%c'\n", _s->s[0], separator); goto error; }

3 years, 3 months

git:master:20db418f: core: parser contact - proper update of length in skip_name()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 20db418f1e35f31d7a90d7cabbd22ae989b7266c URL: https://github.com/kamailio/kamailio/commit/20db418f1e35f31d7a90d7cabbd22ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T10:00:56+02:00 core: parser contact - proper update of length in skip_name() - stop walking name also for unquoted ;, being special char - small typo --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/20db418f1e35f31d7a90d7cabbd22ae… Patch: https://github.com/kamailio/kamailio/commit/20db418f1e35f31d7a90d7cabbd22ae… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 8c6ebdd6bb..345167022f 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -147,10 +147,10 @@ static inline int skip_name(str* _s) return 0; } - if (*p == ':') { + if (*p == ':' || *p == ';') { if (last_wsp) { - _s->s = last_wsp; _s->len -= last_wsp - _s->s + 1; + _s->s = last_wsp; } return 0; } @@ -224,7 +224,7 @@ int parse_contacts(str* _s, contact_t** _c) trim(&c->uri); if((c->uri.len <= 0) || (c->uri.s + c->uri.len > sv.s + sv.len)) { - LM_ERR("invlid contact uri\n"); + LM_ERR("invalid contact uri\n"); goto error; }

3 years, 3 months

[kamailio/kamailio] JavaScript KEMI Interpreter app_jsdt module can't load file large than 128KB (#2847)

by viet0511

### Description Reload JavaScript KEMI Interpreter with file size > 128KB throw error: ``` app_jsdt [app_jsdt_api.c:447]: jsdt_kemi_load_script(): failed running: SyntaxError: parse error (line 1948, end of i nput ``` ### Troubleshooting Find out in this line 1948: in this line, file size reached 128KB Try reducing file size to lower than 128KB, it loads successfully #### Reproduction Alway failed when the file to load larger than 128KB ### Possible Solutions N/A ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.3 (x86_64/linux) e19ae3 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_BLACKLIST, HAVE_RESOLV_RES 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: e19ae3 compiled on 14:01:49 Jan 8 2021 with gcc 4.4.7 ``` * **Operating System**:  ``` CentOS release 6.8 (Final) ``` -- 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/2847

3 years, 3 months

git:master:96656e0d: modules: readme files regenerated - xlog ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 96656e0dfe66aba44ec5fceb27ce5f1e088a78a4 URL: https://github.com/kamailio/kamailio/commit/96656e0dfe66aba44ec5fceb27ce5f1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-07T13:16:24+02:00 modules: readme files regenerated - xlog ... [skip ci] --- Modified: src/modules/xlog/README --- Diff: https://github.com/kamailio/kamailio/commit/96656e0dfe66aba44ec5fceb27ce5f1… Patch: https://github.com/kamailio/kamailio/commit/96656e0dfe66aba44ec5fceb27ce5f1…

3 years, 3 months

git:5.5:9ab3c601: textops: RFC2543 is broken

by Luis Azedo

Module: kamailio Branch: 5.5 Commit: 9ab3c60125291809ba082435a8d593f934cf76c4 URL: https://github.com/kamailio/kamailio/commit/9ab3c60125291809ba082435a8d593f… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2021-09-07T12:13:35+01:00 textops: RFC2543 is broken commit cbcc27ef8b1674448bd8b1c45f03388e36f65f51 broke RFC2543 hold there's no need to check for sendrecv_mode, is_on_hold is either set or not in sdp_stream and/or sdp_session (cherry picked from commit 3ee0670ee9ca5e2812fd90cccef3a7ae4e55a3b4) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/9ab3c60125291809ba082435a8d593f… Patch: https://github.com/kamailio/kamailio/commit/9ab3c60125291809ba082435a8d593f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 4b3216d4d2..1d15be3a7b 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4367,13 +4367,10 @@ static int ki_is_audio_on_hold(sip_msg_t *msg) if(!sdp_stream) break; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && - sdp_stream->sendrecv_mode.len && sdp_stream->is_on_hold) return sdp_stream->is_on_hold; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && - !sdp_stream->sendrecv_mode.len && - sdp_session->sendrecv_mode.len && sdp_session->is_on_hold) return sdp_session->is_on_hold; sdp_stream_num++;

3 years, 3 months

← Newer
1
...
22
23
24
25
26
27
28
...
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