- sr-dev - kamailio.org

git:master:17a2eec2: core: parse_to_param() check for end of data on escape or start of value
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

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;

1 0

git:master:f624e170: core: parser - free unlinked local param structure in parse_to_param()
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

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) {

1 0

git:master:bd92fb59: sca: call unsafe find entry function to avoid infinite recursion
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

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);

1 0

git:master:b86d2490: dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

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);

1 0

git:master:d0b1d4b2: misctest: print input data in hex format
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

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

1 0

git:master:20db418f: core: parser contact - proper update of length in skip_name()
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

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; }

1 0

git:master:a2511df2: core: log unexpected char in parse_param2()
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

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; }

1 0

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

08 Sep '21

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

1 2

git:master:96656e0d: modules: readme files regenerated - xlog ... [skip ci]
by Kamailio Dev 07 Sep '21

07 Sep '21

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…

1 0

git:5.5:9ab3c601: textops: RFC2543 is broken
by Luis Azedo 07 Sep '21

07 Sep '21

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++;

1 0

[kamailio/kamailio] textops: RFC2543 is broken (#2844)
by lazedo 07 Sep '21

07 Sep '21

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   #### 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  removed the check for `sendrecv_mode` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2844 -- Commit Summary -- * textops: RFC2543 is broken -- File Changes -- M src/modules/textops/textops.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2844.patch https://github.com/kamailio/kamailio/pull/2844.diff -- 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/pull/2844

2 2

git:master:3ee0670e: textops: RFC2543 is broken
by lazedo 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: 3ee0670ee9ca5e2812fd90cccef3a7ae4e55a3b4 URL: https://github.com/kamailio/kamailio/commit/3ee0670ee9ca5e2812fd90cccef3a7a… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2021-09-07T12:12:12+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 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/3ee0670ee9ca5e2812fd90cccef3a7a… Patch: https://github.com/kamailio/kamailio/commit/3ee0670ee9ca5e2812fd90cccef3a7a… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 84e93f30ed..bfb5a54941 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4517,13 +4517,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++;

1 0

[kamailio/kamailio] xlog: add prefix_mode (#2845)
by lazedo 07 Sep '21

07 Sep '21

allows pv_format specifier in prefix param   #### 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  add `prefix_mode` param to xlog to optionally interpret `prefix` as a `pv_format` specifier. `config`: ``` mod_param("xlog", "prefix", "$_s([$(cfg(file):$cfg(line)] $ci $(cfg(route){s.tolower}) )") mod_param("xlog", "prefix_mode", 1) ... xlog("L_INFO", "hello") ... ``` `output:` <pre><code> 66(307) INFO: <b>[my-file.cfg:5]</b> 62795aa2-9696c27c <b>my_route</b> hello </code> </pre> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2845 -- Commit Summary -- * xlog: add prefix_mode -- File Changes -- M src/modules/xlog/doc/xlog_admin.xml (22) M src/modules/xlog/xlog.c (46) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2845.patch https://github.com/kamailio/kamailio/pull/2845.diff -- 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/pull/2845

2 3

git:master:88e5f613: xlog: add prefix_mode
by lazedo 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: 88e5f6130a26f37e4e5dfa515ef640443bbc6873 URL: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef6404… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2021-09-07T12:11:47+01:00 xlog: add prefix_mode allows pv_format specifier in prefix param --- Modified: src/modules/xlog/doc/xlog_admin.xml Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef6404… Patch: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef6404… --- diff --git a/src/modules/xlog/doc/xlog_admin.xml b/src/modules/xlog/doc/xlog_admin.xml index 3a6b029c6e..3fcda4c105 100644 --- a/src/modules/xlog/doc/xlog_admin.xml +++ b/src/modules/xlog/doc/xlog_admin.xml @@ -165,6 +165,28 @@ modparam("xlog", "long_format", 1) ... modparam("xlog", "prefix", "-xlog: ") ... +</programlisting> + </example> + </section> + <section id="xlog.p.varname"> + <title><varname>prefix_mode</varname> (str)</title> + <para> + control behaviour of <varname>prefix</varname> value. + if mode = 0 then <varname>prefix</varname> is treated as string (current behaviour). + if mode = 1 then <varname>prefix</varname> is treated as pv_format specifier and value will be evaluated before output. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>prefix_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xlog", "prefix", "$cfg(name):$cfg(line)") +modparam("xlog", "prefix_mode", 1) +... </programlisting> </example> </section> diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index ed167d80ba..ea05e51833 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -60,6 +60,9 @@ MODULE_VERSION char *_xlog_buf = NULL; char *_xlog_prefix = "<script>: "; +int _xlog_prefix_mode = 0; +char *_xlog_prefix_buf = NULL; +pv_elem_t *_xlog_prefix_pvs = NULL; /** parameters */ static int buf_size=4096; @@ -170,6 +173,7 @@ static param_export_t params[]={ {"log_facility", PARAM_STRING, &xlog_facility_name}, {"log_colors", PARAM_STRING|USE_FUNC_PARAM, (void*)xlog_log_colors_param}, {"methods_filter", PARAM_INT, &xlog_default_cfg.methods_filter}, + {"prefix_mode", INT_PARAM, &_xlog_prefix_mode}, {0,0,0} }; @@ -215,6 +219,27 @@ static int mod_init(void) PKG_MEM_ERROR; return -1; } + + if (_xlog_prefix_mode) { + str s; + s.s = _xlog_prefix; + s.len = strlen(s.s); + + if(pv_parse_format(&s, &_xlog_prefix_pvs)<0) + { + LM_ERR("wrong format[%s]\n", s.s); + return -1; + } + + _xlog_prefix_buf = (char*)pkg_malloc((buf_size+1)*sizeof(char)); + if(_xlog_prefix_buf==NULL) + { + PKG_MEM_ERROR; + return -1; + } + + } + return 0; } @@ -222,12 +247,23 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, int level, int line, int facility) { str txt; + char * _xlog_prefix_val = _xlog_prefix; txt.len = buf_size; + txt.s = _xlog_buf; if(xl_print_log(msg, xm->m, _xlog_buf, &txt.len)<0) return -1; - txt.s = _xlog_buf; + + if (_xlog_prefix_mode) { + str _xlog_prefix_str; + _xlog_prefix_str.s = _xlog_prefix_buf; + _xlog_prefix_str.len = buf_size; + if(pv_printf(msg, _xlog_prefix_pvs, _xlog_prefix_str.s, &_xlog_prefix_str.len) == 0 && _xlog_prefix_str.len > 0) { + _xlog_prefix_val = _xlog_prefix_buf; + } + } + /* if facility is not explicitely defined use the xlog default facility */ if (facility==NOFACILITY) { facility = xlog_facility; @@ -235,7 +271,7 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, if(line>0) if(long_format==1) - LOG_FN(facility, level, _xlog_prefix, + LOG_FN(facility, level, _xlog_prefix_val, "%s:%d:%.*s", (xm->a)?(((xm->a->cfile)?xm->a->cfile:"")):"", (xm->a)?xm->a->cline:0, txt.len, txt.s); @@ -243,7 +279,7 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, LOG_FN(facility, level, _xlog_prefix, "%d:%.*s", (xm->a)?xm->a->cline:0, txt.len, txt.s); else - LOG_FN(facility, level, _xlog_prefix, + LOG_FN(facility, level, _xlog_prefix_val, "%.*s", txt.len, txt.s); return 1; } @@ -488,6 +524,10 @@ static void destroy(void) { if(_xlog_buf) pkg_free(_xlog_buf); + if(_xlog_prefix_buf) + pkg_free(_xlog_prefix_buf); + if(_xlog_prefix_pvs) + pv_elem_free_all(_xlog_prefix_pvs); } static int xdbg_fixup_helper(void** param, int param_no, int mode)

1 0

git:master:c12ddec3: modules: readme files regenerated - misctest ... [skip ci]
by Kamailio Dev 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: c12ddec36c7c321054c188eb8efdccd7bb04e168 URL: https://github.com/kamailio/kamailio/commit/c12ddec36c7c321054c188eb8efdccd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-07T11:01:26+02:00 modules: readme files regenerated - misctest ... [skip ci] --- Modified: src/modules/misctest/README --- Diff: https://github.com/kamailio/kamailio/commit/c12ddec36c7c321054c188eb8efdccd… Patch: https://github.com/kamailio/kamailio/commit/c12ddec36c7c321054c188eb8efdccd…

1 0

git:master:d6c52a6a: core: parser contact - link structure once finishing current one
by Daniel-Constantin Mierla 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: d6c52a6afdd38cc05a67a25e55e387ad77a9ddf4 URL: https://github.com/kamailio/kamailio/commit/d6c52a6afdd38cc05a67a25e55e387a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-07T10:50:40+02:00 core: parser contact - link structure once finishing current one --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/d6c52a6afdd38cc05a67a25e55e387a… Patch: https://github.com/kamailio/kamailio/commit/d6c52a6afdd38cc05a67a25e55e387a… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 650740b1a1..8c6ebdd6bb 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -262,13 +262,14 @@ int parse_contacts(str* _s, contact_t** _c) _s->len--; trim_leading(_s); + c->next = *_c; + *_c = c; + c = NULL; + if (_s->len == 0) { LM_ERR("text after comma missing\n"); goto error; } - - c->next = *_c; - *_c = c; } error:

1 0

git:master:c89d1e92: misctest: added option to perform tests for sip message
by Daniel-Constantin Mierla 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: c89d1e922742e93913517d245686b552ded40b09 URL: https://github.com/kamailio/kamailio/commit/c89d1e922742e93913517d245686b55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-07T10:50:41+02:00 misctest: added option to perform tests for sip message --- Modified: src/modules/misctest/doc/misctest_params.xml Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c89d1e922742e93913517d245686b55… Patch: https://github.com/kamailio/kamailio/commit/c89d1e922742e93913517d245686b55…

1 0

git:master:d2dbe98e: core: relocate parse_contact_hader() to parser folder
by Daniel-Constantin Mierla 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: d2dbe98e072f59138b9974ab8f147bcfef5f983e URL: https://github.com/kamailio/kamailio/commit/d2dbe98e072f59138b9974ab8f147bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-07T10:50:40+02:00 core: relocate parse_contact_hader() to parser folder --- Modified: src/core/parser/contact/parse_contact.c Modified: src/core/parser/contact/parse_contact.h Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/d2dbe98e072f59138b9974ab8f147bc… Patch: https://github.com/kamailio/kamailio/commit/d2dbe98e072f59138b9974ab8f147bc… --- diff --git a/src/core/parser/contact/parse_contact.c b/src/core/parser/contact/parse_contact.c index 37a075a17d..242c4a0756 100644 --- a/src/core/parser/contact/parse_contact.c +++ b/src/core/parser/contact/parse_contact.c @@ -228,7 +228,7 @@ int contact_iterator(contact_t** c, struct sip_msg* msg, contact_t* prev) } /** - * + * Parse all contact headers */ int parse_contact_headers(sip_msg_t *msg) { @@ -254,3 +254,20 @@ int parse_contact_headers(sip_msg_t *msg) return 0; } + +/** + * Parse first contact header + */ +int parse_contact_header(sip_msg_t *msg) +{ + if ( !msg->contact && ( parse_headers(msg,HDR_CONTACT_F,0)==-1 + || !msg->contact)) { + LM_DBG("bad msg or missing CONTACT header\n"); + return -1; + } + + if (msg->contact->parsed) + return 0; + + return parse_contact(msg->contact); +} diff --git a/src/core/parser/contact/parse_contact.h b/src/core/parser/contact/parse_contact.h index 4d8e1cd642..e6e38b6e9e 100644 --- a/src/core/parser/contact/parse_contact.h +++ b/src/core/parser/contact/parse_contact.h @@ -75,4 +75,9 @@ int contact_iterator(contact_t** c, struct sip_msg* msg, contact_t* prev); */ int parse_contact_headers(sip_msg_t *msg); +/* + * parse first Contact header + */ +int parse_contact_header(sip_msg_t *msg); + #endif /* PARSE_CONTACT_H */ diff --git a/src/core/select_core.c b/src/core/select_core.c index 02d393a6ba..9b6e2df2d9 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -221,18 +221,6 @@ SELECT_uri_header(from) SELECT_uri_header(refer_to) SELECT_uri_header(rpid) -int parse_contact_header( struct sip_msg *msg) -{ - if ( !msg->contact && ( parse_headers(msg,HDR_CONTACT_F,0)==-1 || !msg->contact)) { - LM_DBG("bad msg or missing CONTACT header\n"); - return -1; - } - - if (msg->contact->parsed) - return 0; - - return parse_contact(msg->contact); -} #define get_contact(msg) ((contact_body_t*)(msg->contact->parsed))

1 0

Info: Kamailio World 2021 starting soon - live stream
by Daniel-Constantin Mierla 07 Sep '21

07 Sep '21

Hello, to sync better on time, Kamailio World 2021 online edition is starting in about 2 hours from now (12:50 UTC Welcome and 13:00UTC the first session) - the agenda is available at: * https://kamailioworld.com/k09-online/ In short: participation is free, no registration is needed. The sessions are live streamed to YouTube KamailioWorld channel: * https://www.youtube.com/c/KamailioWorld/ YouTube chat next to the live stream can be used for addressing questions to speakers -- we will monitor it and ask the speaker inside the video conferencing room. For community interaction via text chatting, you can join the Matrix room #kamailio:matrix.kamailio.dev : * https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev Questions for speakers can also be addressed in this chat room. If anyone wants to participate in the live video conferencing room, the URL is: * https://meet.kamailioworld.com/live Just note that we may have to limit the number of participants in the live session in order to ensure proper streaming quality. See you soon online! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 4

git:master:afcf3fb4: modules: readme files regenerated - misctest ... [skip ci]
by Kamailio Dev 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: afcf3fb4eff2cebd88d60c31f74ed952f331f729 URL: https://github.com/kamailio/kamailio/commit/afcf3fb4eff2cebd88d60c31f74ed95… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-06T15:31:14+02:00 modules: readme files regenerated - misctest ... [skip ci] --- Modified: src/modules/misctest/README --- Diff: https://github.com/kamailio/kamailio/commit/afcf3fb4eff2cebd88d60c31f74ed95… Patch: https://github.com/kamailio/kamailio/commit/afcf3fb4eff2cebd88d60c31f74ed95…

1 0

git:master:bc06c9f9: misctest: added memory module parameter
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: bc06c9f9ca546a6892c9a59f10fd0a963b46c737 URL: https://github.com/kamailio/kamailio/commit/bc06c9f9ca546a6892c9a59f10fd0a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T15:23:17+02:00 misctest: added memory module parameter - control if it should do initialization for memory testing --- Modified: src/modules/misctest/doc/misctest_params.xml Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bc06c9f9ca546a6892c9a59f10fd0a9… Patch: https://github.com/kamailio/kamailio/commit/bc06c9f9ca546a6892c9a59f10fd0a9… --- diff --git a/src/modules/misctest/doc/misctest_params.xml b/src/modules/misctest/doc/misctest_params.xml index 9bb0a10bfa..db19e29a26 100644 --- a/src/modules/misctest/doc/misctest_params.xml +++ b/src/modules/misctest/doc/misctest_params.xml @@ -12,6 +12,25 @@ </sectioninfo> <title>Parameters</title> + <section id="misctest.p.memory"> + <title><varname>memory</varname></title> + <para> + Initialize for memory testing. Set it to 1 to prepare the memory + testing. + </para> + <para> + Default: 0 (off). + </para> + <example> + <title> + Set <varname>memory</varname> in the config file + </title> + <programlisting> +modparam("misctest", "memory", 1) + </programlisting> + </example> + </section> + <section id="misctest.p.mem_check_content"> <title><varname>mem_check_content</varname></title> <para> diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index e26320ef93..2ce3187812 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -37,6 +37,7 @@ static int mt_mem_free_f(struct sip_msg *, char *, char *); static int mod_init(void); static void mod_destroy(void); +static int misctest_memory = 0; /* clang-format off */ static cmd_export_t cmds[]={ @@ -87,6 +88,7 @@ static rpc_export_t mt_rpc[]; /* clang-format off */ static param_export_t params[]={ + {"memory", PARAM_INT, &misctest_memory}, {"mem_check_content", PARAM_INT, &default_mt_cfg.mem_check_content}, {0,0,0} }; @@ -172,21 +174,23 @@ static int mod_init(void) goto error; } - alloc_lst = shm_malloc(sizeof(*alloc_lst)); - if(alloc_lst == 0) - goto error; - alloc_lst->chunks = 0; - atomic_set_long(&alloc_lst->size, 0); - atomic_set_int(&alloc_lst->no, 0); - if(lock_init(&alloc_lst->lock) == 0) - goto error; - rndt_lst = shm_malloc(sizeof(*rndt_lst)); - if(rndt_lst == 0) - goto error; - rndt_lst->tests = 0; - atomic_set_int(&rndt_lst->last_id, 0); - if(lock_init(&rndt_lst->lock) == 0) - goto error; + if(misctest_memory!=0) { + alloc_lst = shm_malloc(sizeof(*alloc_lst)); + if(alloc_lst == 0) + goto error; + alloc_lst->chunks = 0; + atomic_set_long(&alloc_lst->size, 0); + atomic_set_int(&alloc_lst->no, 0); + if(lock_init(&alloc_lst->lock) == 0) + goto error; + rndt_lst = shm_malloc(sizeof(*rndt_lst)); + if(rndt_lst == 0) + goto error; + rndt_lst->tests = 0; + atomic_set_int(&rndt_lst->last_id, 0); + if(lock_init(&rndt_lst->lock) == 0) + goto error; + } return 0; error: return -1; @@ -195,17 +199,19 @@ static int mod_init(void) static void mod_destroy() { - if(rndt_lst) { - mem_destroy_all_tests(); - lock_destroy(&rndt_lst->lock); - shm_free(rndt_lst); - rndt_lst = 0; - } - if(alloc_lst) { - mem_unleak(-1); - lock_destroy(&alloc_lst->lock); - shm_free(alloc_lst); - alloc_lst = 0; + if(misctest_memory!=0) { + if(rndt_lst) { + mem_destroy_all_tests(); + lock_destroy(&rndt_lst->lock); + shm_free(rndt_lst); + rndt_lst = 0; + } + if(alloc_lst) { + mem_unleak(-1); + lock_destroy(&alloc_lst->lock); + shm_free(alloc_lst); + alloc_lst = 0; + } } }

1 0

git:master:01aa8666: modules/malloc_test: renamed module to misctest
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 01aa8666c1419689b009e82fc23ff12d3a165715 URL: https://github.com/kamailio/kamailio/commit/01aa8666c1419689b009e82fc23ff12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T14:52:50+02:00 modules/malloc_test: renamed module to misctest - generic name to include tests not related to memory --- Added: src/modules/misctest/Makefile Added: src/modules/misctest/README Added: src/modules/misctest/doc/Makefile Added: src/modules/misctest/doc/misctest.xml Added: src/modules/misctest/doc/misctest_functions.xml Added: src/modules/misctest/doc/misctest_params.xml Added: src/modules/misctest/doc/misctest_rpc.xml Added: src/modules/misctest/misctest_mod.c Removed: src/modules/malloc_test/Makefile Removed: src/modules/malloc_test/README Removed: src/modules/malloc_test/doc/Makefile Removed: src/modules/malloc_test/doc/malloc_test.xml Removed: src/modules/malloc_test/doc/malloc_test_functions.xml Removed: src/modules/malloc_test/doc/malloc_test_params.xml Removed: src/modules/malloc_test/doc/malloc_test_rpc.xml Removed: src/modules/malloc_test/malloc_test.c --- Diff: https://github.com/kamailio/kamailio/commit/01aa8666c1419689b009e82fc23ff12… Patch: https://github.com/kamailio/kamailio/commit/01aa8666c1419689b009e82fc23ff12…

1 0

git:master:76e6033f: core: catch empty string on parsing params
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 76e6033ff14fec0f2db0b387803b4c5815a91163 URL: https://github.com/kamailio/kamailio/commit/76e6033ff14fec0f2db0b387803b4c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T14:56:36+02:00 core: catch empty string on parsing params --- Modified: src/core/parser/parse_param.c --- Diff: https://github.com/kamailio/kamailio/commit/76e6033ff14fec0f2db0b387803b4c5… Patch: https://github.com/kamailio/kamailio/commit/76e6033ff14fec0f2db0b387803b4c5… --- diff --git a/src/core/parser/parse_param.c b/src/core/parser/parse_param.c index b80ffbdcc0..5452cbe50b 100644 --- a/src/core/parser/parse_param.c +++ b/src/core/parser/parse_param.c @@ -584,7 +584,7 @@ int parse_params2( memset(_h, 0, sizeof(param_hooks_t)); *_p = 0; - if(!_s->s) { /* no parameters at all -- we're done */ + if(!_s->s || _s->len<=0) { /* no parameters at all -- we're done */ LM_DBG("empty uri params, skipping\n"); return 0; }

1 0

git:master:5fa78d73: malloc_test: removed svn id - clang formatted code
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 5fa78d73b30cb5e221446abd63b84f90bc00927d URL: https://github.com/kamailio/kamailio/commit/5fa78d73b30cb5e221446abd63b84f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T14:35:38+02:00 malloc_test: removed svn id - clang formatted code --- Modified: src/modules/malloc_test/malloc_test.c --- Diff: https://github.com/kamailio/kamailio/commit/5fa78d73b30cb5e221446abd63b84f9… Patch: https://github.com/kamailio/kamailio/commit/5fa78d73b30cb5e221446abd63b84f9…

1 0

git:master:f7690117: core: parser - ensure content lenght value does not exceed max int
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: f769011743feccde0fbca8531ab4e1b3563bf155 URL: https://github.com/kamailio/kamailio/commit/f769011743feccde0fbca8531ab4e1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T13:51:32+02:00 core: parser - ensure content lenght value does not exceed max int --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/f769011743feccde0fbca8531ab4e1b… Patch: https://github.com/kamailio/kamailio/commit/f769011743feccde0fbca8531ab4e1b… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index 34cdd40e36..ee56e09b7a 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -233,6 +233,10 @@ char* parse_content_length(char* const buffer, const char* const end, size = 0; number = 0; while (p<end && *p>='0' && *p<='9') { + if(number >= INT_MAX/10) { + LM_ERR("content lenght value is too large\n"); + goto error; + } number = number*10 + (*p)-'0'; size ++; p++;

1 0

git:master:116ef944: core: parser - free local unused param structure
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 116ef94420bf6ed9e0ae3bc08a612d8d0c4aa0a7 URL: https://github.com/kamailio/kamailio/commit/116ef94420bf6ed9e0ae3bc08a612d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T13:21:33+02:00 core: parser - free local unused param structure --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/116ef94420bf6ed9e0ae3bc08a612d8… Patch: https://github.com/kamailio/kamailio/commit/116ef94420bf6ed9e0ae3bc08a612d8… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 8bbbdefa72..604791c7b0 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -555,6 +555,9 @@ static char *parse_to_param(char *const buffer, const char *const end, saved_status, (int)(tmp - buffer), ZSW(buffer)); goto error; } + if(newparam) { + pkg_free(newparam); + } *returned_status = saved_status; return tmp;

1 0

git:master:baed515e: core: parse content length - consider multi line header format
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: baed515e8aed8e5b505ff716eb57d0c60e582632 URL: https://github.com/kamailio/kamailio/commit/baed515e8aed8e5b505ff716eb57d0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T13:01:55+02:00 core: parse content length - consider multi line header format - safety checks for log message when not parsing the message buffer --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/baed515e8aed8e5b505ff716eb57d0c… Patch: https://github.com/kamailio/kamailio/commit/baed515e8aed8e5b505ff716eb57d0c… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index 007217df96..34cdd40e36 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -219,6 +219,10 @@ char* parse_content_length(char* const buffer, const char* const end, int size; p = buffer; + if(buffer>=end) { + LM_ERR("empty input buffer: %p - %p\n", buffer, end); + goto error; + } /* search the begining of the number */ while ( p<end && (*p==' ' || *p=='\t' || (*p=='\n' && (*(p+1)==' '||*(p+1)=='\t')) )) @@ -235,20 +239,40 @@ char* parse_content_length(char* const buffer, const char* const end, } if (p==end || size==0) goto error; - /* now we should have only spaces at the end */ - while ( p<end && (*p==' ' || *p=='\t' || - (*p=='\n' && (*(p+1)==' '||*(p+1)=='\t')) )) - p++; - if (p==end) - goto error; - /* the header ends proper? */ - if ( (*(p++)!='\n') && (*(p-1)!='\r' || *(p++)!='\n' ) ) - goto error; + do { + /* only spaces till the end-of-header */ + while (p<end && (*p==' ' || *p=='\t')) p++; + if (p==end) + goto error; + /* EOH with \n or \r\n */ + if(*p=='\n') { + p++; + } else if (p+1<end && *p=='\r' && *(p+1)=='\n') { + p += 2; + } else { + /* no valid EOH */ + goto error; + } + if(p<end) { + /* multi line header body */ + if(*p==' ' || *p=='\t') { + p++; + if (p==end) + goto error; + } else { + break; + } + } + } while(p<end); *length = number; return p; error: - LM_ERR("parse error near char [%d][%c]\n", *p, *p); + if(p<end) { + LM_ERR("parse error near char [%d][%c]\n", *p, *p); + } else { + LM_ERR("parse error over the end of input: %p - %p\n", buffer, end); + } return 0; }

1 0

git:5.5:c01b0d94: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 Sep '21

06 Sep '21

Module: kamailio Branch: 5.5 Commit: c01b0d942b9e26e2ce0cf266abdee6eb63e8e55e URL: https://github.com/kamailio/kamailio/commit/c01b0d942b9e26e2ce0cf266abdee6e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-06T10:46:31+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/c01b0d942b9e26e2ce0cf266abdee6e… Patch: https://github.com/kamailio/kamailio/commit/c01b0d942b9e26e2ce0cf266abdee6e… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 734dc7435d..86dde8f336 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -549,17 +549,17 @@ Revoking a certificate and using a CRL require the certificate file and list of CA certificates per a regular TLS configuration. -AWS CloudHSM Example +Thales Luna Example -------------------- ... -# Example for AWS CloudHSM (SafeNet Luna) +# Example for Thales Luna modparam("tls", "engine", "gem") -modparam("tls", "engine_config", "/usr/local/etc/kamailio/luna.conf") -modparam("tls", "engine_algorithms", "ALL) +modparam("tls", "engine_config", "/usr/local/etc/kamailio/thales.cnf") +modparam("tls", "engine_algorithms", "EC") ... -/usr/local/etc/kamailio/luna.cnf is a OpenSSL config format file used to +/usr/local/etc/kamailio/thales.cnf is a OpenSSL config format file used to bootstrap the engine, e.g., pass the PIN. ... @@ -570,11 +570,12 @@ kamailio = openssl_init engines = engine_section [ engine_section ] -# gem is the name of the SafeNet Luna OpenSSL engine +# gem is the name of the Thales Luna OpenSSL engine gem = gem_section [ gem_section ] -# from SafeNet documentation +# from Thales documentation +dynamic_path = /usr/lib64/engines-1.1/gem.so ENGINE_INIT = 0:20:21:password=1234-ABCD-5678-EFGH ...

1 0

git:master:f1e87166: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: f1e87166d097bde903594aecfff2e562c1496e4f URL: https://github.com/kamailio/kamailio/commit/f1e87166d097bde903594aecfff2e56… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-06T10:46:15+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/f1e87166d097bde903594aecfff2e56… Patch: https://github.com/kamailio/kamailio/commit/f1e87166d097bde903594aecfff2e56… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 4b634e24e6..127cfa7601 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -545,17 +545,17 @@ Revoking a certificate and using a CRL require the certificate file and list of CA certificates per a regular TLS configuration. -AWS CloudHSM Example +Thales Luna Example -------------------- ... -# Example for AWS CloudHSM (SafeNet Luna) +# Example for Thales Luna modparam("tls", "engine", "gem") -modparam("tls", "engine_config", "/usr/local/etc/kamailio/luna.conf") -modparam("tls", "engine_algorithms", "ALL) +modparam("tls", "engine_config", "/usr/local/etc/kamailio/thales.cnf") +modparam("tls", "engine_algorithms", "EC") ... -/usr/local/etc/kamailio/luna.cnf is a OpenSSL config format file used to +/usr/local/etc/kamailio/thales.cnf is a OpenSSL config format file used to bootstrap the engine, e.g., pass the PIN. ... @@ -566,11 +566,12 @@ kamailio = openssl_init engines = engine_section [ engine_section ] -# gem is the name of the SafeNet Luna OpenSSL engine +# gem is the name of the Thales Luna OpenSSL engine gem = gem_section [ gem_section ] -# from SafeNet documentation +# from Thales documentation +dynamic_path = /usr/lib64/engines-1.1/gem.so ENGINE_INIT = 0:20:21:password=1234-ABCD-5678-EFGH ...

1 0

git:5.5:ad5af6d3: tls: fix OpenSSL engine in child processes
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: 5.5 Commit: ad5af6d3acd648e6bd57b923083cc26d3a3d0f57 URL: https://github.com/kamailio/kamailio/commit/ad5af6d3acd648e6bd57b923083cc26… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:35:01+02:00 tls: fix OpenSSL engine in child processes tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839 (cherry picked from commit 238ef139bfbe145fb93e5c4b0730de58040d2265) --- Modified: src/modules/tls/doc/hsm_howto.xml Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ad5af6d3acd648e6bd57b923083cc26… Patch: https://github.com/kamailio/kamailio/commit/ad5af6d3acd648e6bd57b923083cc26…

1 0

[kamailio/kamailio] OpenSSL 1.1.1 and HSM keys incoming patches (#2839)
by aalba6675 06 Sep '21

06 Sep '21

### Description When using HSM keys (via OpenSSL engine) the engine and private keys are loaded in the child processes since PKCS#11 modules rarely survive `fork()`. With OpenSSL 1.1.1 and the call to `OPENSSL_init_ssl()` in `tls_init.c` the engine linked-list is now initialized in the master process. Subsequently the technique used in `tls_init.c:660 CONF_modules_load_file()` will fail as each child process manipulates the linked-list. Even if the engine linked-list manipulation itself is protected by global locks; traversing the linked-list will encounter invalid memory locations as the nodes are insert by other child processes. This issue is filed as a marker; I will be providing patches to change the way HSM private keys are loaded in the child process to avoid linked-list corruption. ### Troubleshooting - use soft (PEM) keys — no issue as OpenSSL engine is not relevant in this context #### Reproduction - configure TLS with OpenSSL engine key(e.g pkcs11 engine with SoftHSM keys) ### Additional Information Root cause: the function `CONF_modules_load_file()` will configure OpenSSL engines from a OpenSSL configuration file but it also adds each engine to the global linked list. Unfortunately there is no OpenSSL function to reset the linked-list in the child process. It seems to be initialized once at start-up: the linked-list head/tail pointers are static variables and their initialization is protected by OpenSSL's `RUN_ONCE` mechanism, so it doesn't seem it supported mechanism to have them reinitialized after `fork()`. -- 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/2839

2 3

[kamailio/kamailio] tls: fix OpenSSL engine in child processes (#2840)
by aalba6675 06 Sep '21

06 Sep '21

tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839   #### 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 - [X] Related to issue #2839 #### Description The call to `OPENSSL_init_ssl()` in `tls_init.c` results in the creation of the engine linked-list in the parent. This affects per-child engine private keys as there is no api to reinitialize the engine linked-list in the child. This PR removes the call to `CONF_modules_load_file()` which causes linked-list corruption and replaces the initialization of engine private keys in the child with with other api calls which do not manipulate global objects. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2840 -- Commit Summary -- * tls: fix OpenSSL engine in child processes -- File Changes -- M src/modules/tls/doc/hsm_howto.xml (15) M src/modules/tls/tls_mod.c (93) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2840.patch https://github.com/kamailio/kamailio/pull/2840.diff -- 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/pull/2840

2 6

git:master:238ef139: tls: fix OpenSSL engine in child processes
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 238ef139bfbe145fb93e5c4b0730de58040d2265 URL: https://github.com/kamailio/kamailio/commit/238ef139bfbe145fb93e5c4b0730de5… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:33:13+02:00 tls: fix OpenSSL engine in child processes tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839 --- Modified: src/modules/tls/doc/hsm_howto.xml Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/238ef139bfbe145fb93e5c4b0730de5… Patch: https://github.com/kamailio/kamailio/commit/238ef139bfbe145fb93e5c4b0730de5…

1 0

[kamailio/kamailio] tlsf is broken (#2843)
by lazedo 06 Sep '21

06 Sep '21

### Description  ### Troubleshooting #### Reproduction kamailio -c -x tlsf -f misc/examples/pkg/kamailio-basic.cfg #### Debugging Data ``` core was generated by `kamailio -c -x tlsf -f misc/examples/pkg/kamailio-basic.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x0000555e79902495 in str_hash_add (ht=0x555e79d6e0f0 <main_rt+16>, e=0x7f01c0521a48) at core/str_hash.h:85 85 clist_insert(&ht->table[h], e, next, prev); (gdb) bt full #0 0x0000555e79902495 in str_hash_add (ht=0x555e79d6e0f0 <main_rt+16>, e=0x7f01c0521a48) at core/str_hash.h:85 h = 6 #1 0x0000555e79902e46 in route_add (rt=0x555e79d6e0e0 <main_rt>, name=0x555e79bd87be "0", i=0) at core/route.c:134 e = 0x7f01c0521a48 __func__ = "route_add" #2 0x0000555e799035f3 in init_rlist (r_name=0x555e79bd87c0 "main", rt=0x555e79d6e0e0 <main_rt>, n_entries=2, hash_size=8) at core/route.c:160 __func__ = "init_rlist" #3 0x0000555e79903647 in init_routes () at core/route.c:172 No locals. #4 0x0000555e79776eaa in main (argc=6, argv=0x7ffec006df78) at main.c:2408 cfg_stream = 0x0 c = -1 r = 0 tmp = 0x0 tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x555e79ba60a8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 0 rfd = 0 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 0, st_ino = 0, st_nlink = 0, st_mode = 0, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 0, st_blksize = 0, st_blocks = 0, st_atim = {tv_sec = 0, tv_nsec = 0}, st_mtim = {tv_sec = 0, tv_nsec = 0}, st_ctim = {tv_sec = 0, tv_nsec = 0}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 2336 times>... option_index = 0 long_options = {{name = 0x555e79ba85a6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x555e79ba3504 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x555e79ba85ab "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x555e79ba85b1 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x555e79ba85b7 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x555e79ba85c0 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x555e79ba85ca "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x555e79ba85d4 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x555e79ba85df "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x555e79ba85e8 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x555e79ba85f3 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x555e79ba85f9 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x555e79ba8603 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x555e79ba860a "defenv", has_arg = 1, flag = 0x0, val = 1035}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals h = 6 (gdb) list 80 struct str_hash_entry* e) 81 { 82 int h; 83 84 h=get_hash1_raw(e->key.s, e->key.len) % ht->size; 85 clist_insert(&ht->table[h], e, next, prev); 86 } 87 88 89 (gdb) ``` ### Possible Solutions works after reverting - ddafeebfaf1537c684eee22be228867563dd02ac - 2d7aee506c617f2d258719562f8debf2b4ba087e ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` bash-5.0# kamailio -v version: kamailio 5.5.2 (x86_64/linux) 55e232-dirty 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: 55e232 -dirty compiled on 15:08:48 Sep 5 2021 with gcc 9.3.0 ``` * **Operating System**:  ``` Alpine Docker Image 3.12 ``` -- 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/2843

2 2

git:5.5:185d8b24: Revert "core/mem: removed tlsf_malloc_bits.h"
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: 5.5 Commit: 185d8b24c411a38b5b2c2632abdbf90b3796fbf6 URL: https://github.com/kamailio/kamailio/commit/185d8b24c411a38b5b2c2632abdbf90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:31:26+02:00 Revert "core/mem: removed tlsf_malloc_bits.h" This reverts commit 2d7aee506c617f2d258719562f8debf2b4ba087e. (cherry picked from commit 90f4bd591aba7c6fbe234df1f3868edf4ff0a9f1) --- Added: src/core/mem/tlsf_malloc_bits.h --- Diff: https://github.com/kamailio/kamailio/commit/185d8b24c411a38b5b2c2632abdbf90… Patch: https://github.com/kamailio/kamailio/commit/185d8b24c411a38b5b2c2632abdbf90… --- diff --git a/src/core/mem/tlsf_malloc_bits.h b/src/core/mem/tlsf_malloc_bits.h new file mode 100644 index 0000000000..29c783d4a4 --- /dev/null +++ b/src/core/mem/tlsf_malloc_bits.h @@ -0,0 +1,119 @@ +#ifndef INCLUDED_tlsfbits +#define INCLUDED_tlsfbits + +#if defined(__cplusplus) +#define tlsf_decl inline +#else +#define tlsf_decl static +#endif + +/* +** Architecture-specific bit manipulation routines. +** +** TLSF achieves O(1) cost for malloc and free operations by limiting +** the search for a free block to a free list of guaranteed size +** adequate to fulfill the request, combined with efficient free list +** queries using bitmasks and architecture-specific bit-manipulation +** routines. +** +** Most modern processors provide instructions to count leading zeroes +** in a word, find the lowest and highest set bit, etc. These +** specific implementations will be used when available, falling back +** to a reasonably efficient generic implementation. +** +** NOTE: TLSF spec relies on ffs/fls returning value 0..31. +** ffs/fls return 1-32 by default, returning 0 for error. +*/ + +/* +** Detect whether or not we are building for a 32- or 64-bit (LP/LLP) +** architecture. There is no reliable portable method at compile-time. +*/ +#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) \ + || defined (_WIN64) || defined (__LP64__) || defined (__LLP64__) +#define TLSF_64BIT +#endif + +/* +** gcc 3.4 and above have builtin support, specialized for architecture. +** Some compilers masquerade as gcc; patchlevel test filters them out. +** +** Note: clang is compatible with GCC builtins and will also define those macros +*/ +#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \ + && defined (__GNUC_PATCHLEVEL__) + +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return __builtin_ffs(word) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + const int bit = word ? 32 - __builtin_clz(word) : 0; + return bit - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + const int bit = size ? 64 - __builtin_clzl(size) : 0; + return bit - 1; +} +#endif +#else +/* Fall back to generic implementation. */ + +tlsf_decl int tlsf_fls_generic(unsigned int word) +{ + int bit = 32; + + if (!word) bit -= 1; + if (!(word & 0xffff0000)) { word <<= 16; bit -= 16; } + if (!(word & 0xff000000)) { word <<= 8; bit -= 8; } + if (!(word & 0xf0000000)) { word <<= 4; bit -= 4; } + if (!(word & 0xc0000000)) { word <<= 2; bit -= 2; } + if (!(word & 0x80000000)) { word <<= 1; bit -= 1; } + + return bit; +} + +/* Implement ffs in terms of fls. */ +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return tlsf_fls_generic(word & (~word + 1)) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + return tlsf_fls_generic(word) - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + int high = (int)(size >> 32); + int bits = 0; + if (high) + { + bits = 32 + tlsf_fls(high); + } + else + { + bits = tlsf_fls((int)size & 0xffffffff); + + } + return bits; +} +#endif /* defined (TLSF_64BIT) */ + +#endif /* GNUC */ + + +#if !defined (TLSF_64BIT) +#define tlsf_fls_sizet tlsf_fls +#endif + +#undef tlsf_decl + +#endif

1 0

git:5.5:946ec979: Revert "core/mem: tlsf malloc - sync'ed with v3.1"
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: 5.5 Commit: 946ec97950e13196926487db817abf2d1655c6b7 URL: https://github.com/kamailio/kamailio/commit/946ec97950e13196926487db817abf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:31:12+02:00 Revert "core/mem: tlsf malloc - sync'ed with v3.1" This reverts commit ddafeebfaf1537c684eee22be228867563dd02ac. (cherry picked from commit 39c53260599405db4626c8a691552f3aabd3448c) --- Modified: src/core/mem/tlsf_malloc.c Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/946ec97950e13196926487db817abf2… Patch: https://github.com/kamailio/kamailio/commit/946ec97950e13196926487db817abf2…

1 0

git:master:90f4bd59: Revert "core/mem: removed tlsf_malloc_bits.h"
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 90f4bd591aba7c6fbe234df1f3868edf4ff0a9f1 URL: https://github.com/kamailio/kamailio/commit/90f4bd591aba7c6fbe234df1f3868ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:29:50+02:00 Revert "core/mem: removed tlsf_malloc_bits.h" This reverts commit 2d7aee506c617f2d258719562f8debf2b4ba087e. --- Added: src/core/mem/tlsf_malloc_bits.h --- Diff: https://github.com/kamailio/kamailio/commit/90f4bd591aba7c6fbe234df1f3868ed… Patch: https://github.com/kamailio/kamailio/commit/90f4bd591aba7c6fbe234df1f3868ed… --- diff --git a/src/core/mem/tlsf_malloc_bits.h b/src/core/mem/tlsf_malloc_bits.h new file mode 100644 index 0000000000..29c783d4a4 --- /dev/null +++ b/src/core/mem/tlsf_malloc_bits.h @@ -0,0 +1,119 @@ +#ifndef INCLUDED_tlsfbits +#define INCLUDED_tlsfbits + +#if defined(__cplusplus) +#define tlsf_decl inline +#else +#define tlsf_decl static +#endif + +/* +** Architecture-specific bit manipulation routines. +** +** TLSF achieves O(1) cost for malloc and free operations by limiting +** the search for a free block to a free list of guaranteed size +** adequate to fulfill the request, combined with efficient free list +** queries using bitmasks and architecture-specific bit-manipulation +** routines. +** +** Most modern processors provide instructions to count leading zeroes +** in a word, find the lowest and highest set bit, etc. These +** specific implementations will be used when available, falling back +** to a reasonably efficient generic implementation. +** +** NOTE: TLSF spec relies on ffs/fls returning value 0..31. +** ffs/fls return 1-32 by default, returning 0 for error. +*/ + +/* +** Detect whether or not we are building for a 32- or 64-bit (LP/LLP) +** architecture. There is no reliable portable method at compile-time. +*/ +#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) \ + || defined (_WIN64) || defined (__LP64__) || defined (__LLP64__) +#define TLSF_64BIT +#endif + +/* +** gcc 3.4 and above have builtin support, specialized for architecture. +** Some compilers masquerade as gcc; patchlevel test filters them out. +** +** Note: clang is compatible with GCC builtins and will also define those macros +*/ +#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \ + && defined (__GNUC_PATCHLEVEL__) + +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return __builtin_ffs(word) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + const int bit = word ? 32 - __builtin_clz(word) : 0; + return bit - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + const int bit = size ? 64 - __builtin_clzl(size) : 0; + return bit - 1; +} +#endif +#else +/* Fall back to generic implementation. */ + +tlsf_decl int tlsf_fls_generic(unsigned int word) +{ + int bit = 32; + + if (!word) bit -= 1; + if (!(word & 0xffff0000)) { word <<= 16; bit -= 16; } + if (!(word & 0xff000000)) { word <<= 8; bit -= 8; } + if (!(word & 0xf0000000)) { word <<= 4; bit -= 4; } + if (!(word & 0xc0000000)) { word <<= 2; bit -= 2; } + if (!(word & 0x80000000)) { word <<= 1; bit -= 1; } + + return bit; +} + +/* Implement ffs in terms of fls. */ +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return tlsf_fls_generic(word & (~word + 1)) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + return tlsf_fls_generic(word) - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + int high = (int)(size >> 32); + int bits = 0; + if (high) + { + bits = 32 + tlsf_fls(high); + } + else + { + bits = tlsf_fls((int)size & 0xffffffff); + + } + return bits; +} +#endif /* defined (TLSF_64BIT) */ + +#endif /* GNUC */ + + +#if !defined (TLSF_64BIT) +#define tlsf_fls_sizet tlsf_fls +#endif + +#undef tlsf_decl + +#endif

1 0

git:master:39c53260: Revert "core/mem: tlsf malloc - sync'ed with v3.1"
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 39c53260599405db4626c8a691552f3aabd3448c URL: https://github.com/kamailio/kamailio/commit/39c53260599405db4626c8a691552f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:29:29+02:00 Revert "core/mem: tlsf malloc - sync'ed with v3.1" This reverts commit ddafeebfaf1537c684eee22be228867563dd02ac. --- Modified: src/core/mem/tlsf_malloc.c Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/39c53260599405db4626c8a691552f3… Patch: https://github.com/kamailio/kamailio/commit/39c53260599405db4626c8a691552f3…

1 0

git:master:a133a273: core: dprint - include <stdint.h> for uintmax_t
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: a133a27336fa12de01319489318fd5e042b49110 URL: https://github.com/kamailio/kamailio/commit/a133a27336fa12de01319489318fd5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T09:44:10+02:00 core: dprint - include <stdint.h> for uintmax_t --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/a133a27336fa12de01319489318fd5e… Patch: https://github.com/kamailio/kamailio/commit/a133a27336fa12de01319489318fd5e… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 9278a701f2..4a6dac31ca 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -35,6 +35,7 @@ #include <stdarg.h> #include <stdio.h> #include <strings.h> +#include <stdint.h> #include "globals.h" #include "dprint.h"

1 0

git:master:c5e88081: core: cast pthread_self() in log - some distros makes the type opaque
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: c5e880814e3a5270583dd8032c7378cde6905813 URL: https://github.com/kamailio/kamailio/commit/c5e880814e3a5270583dd8032c7378c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T09:23:40+02:00 core: cast pthread_self() in log - some distros makes the type opaque --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/c5e880814e3a5270583dd8032c7378c… Patch: https://github.com/kamailio/kamailio/commit/c5e880814e3a5270583dd8032c7378c… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 1294037b7a..9278a701f2 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -720,7 +720,7 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) fprintf(stderr, KSR_SLOG_JSON_CEEFMT, iso8601buf, _tp.tv_nsec, my_pid(), #ifdef HAVE_PTHREAD - pthread_self(), + (uintmax_t)pthread_self(), #endif kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, s_out.s,

1 0

git:master:cfb5c453: app_ruby: utils/app_ruby_ctl - increade api skeleton functions to 1536
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: cfb5c453caaee341dc4ee1d9f2cdc5b1c3c87eea URL: https://github.com/kamailio/kamailio/commit/cfb5c453caaee341dc4ee1d9f2cdc5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T08:21:30+02:00 app_ruby: utils/app_ruby_ctl - increade api skeleton functions to 1536 --- Modified: src/modules/app_ruby/utils/app_ruby_ctl --- Diff: https://github.com/kamailio/kamailio/commit/cfb5c453caaee341dc4ee1d9f2cdc5b… Patch: https://github.com/kamailio/kamailio/commit/cfb5c453caaee341dc4ee1d9f2cdc5b… --- diff --git a/src/modules/app_ruby/utils/app_ruby_ctl b/src/modules/app_ruby/utils/app_ruby_ctl index e8c7109ea3..cad044f222 100755 --- a/src/modules/app_ruby/utils/app_ruby_ctl +++ b/src/modules/app_ruby/utils/app_ruby_ctl @@ -2,7 +2,7 @@ # generate the .h file -KEMI_MAX_SIZE=1024 +KEMI_MAX_SIZE=1536 cat > ../app_ruby_kemi_export.h <<EOF /**

1 0

git:master:8b128b7d: app_ruby: regenerated api skeleton functions
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 8b128b7dd544e3e30d615da39e84cec91588249a URL: https://github.com/kamailio/kamailio/commit/8b128b7dd544e3e30d615da39e84cec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T08:25:24+02:00 app_ruby: regenerated api skeleton functions --- Modified: src/modules/app_ruby/app_ruby_kemi_export.c Modified: src/modules/app_ruby/app_ruby_kemi_export.h --- Diff: https://github.com/kamailio/kamailio/commit/8b128b7dd544e3e30d615da39e84cec… Patch: https://github.com/kamailio/kamailio/commit/8b128b7dd544e3e30d615da39e84cec…

1 0

git:master:031fd469: core: print char code on error in parse_addr_spec()
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 031fd46980b34a570385f49f168b13af43d84b87 URL: https://github.com/kamailio/kamailio/commit/031fd46980b34a570385f49f168b13a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T08:15:58+02:00 core: print char code on error in parse_addr_spec() --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/031fd46980b34a570385f49f168b13a… Patch: https://github.com/kamailio/kamailio/commit/031fd46980b34a570385f49f168b13a…

1 0

git:master:017f5d81: README.md: 20 years of development anniversary
by Daniel-Constantin Mierla 03 Sep '21

03 Sep '21

Module: kamailio Branch: master Commit: 017f5d81f05f9589bc6bcf47e94af24648efee09 URL: https://github.com/kamailio/kamailio/commit/017f5d81f05f9589bc6bcf47e94af24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-03T11:15:14+02:00 README.md: 20 years of development anniversary --- Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/017f5d81f05f9589bc6bcf47e94af24… Patch: https://github.com/kamailio/kamailio/commit/017f5d81f05f9589bc6bcf47e94af24… --- diff --git a/README.md b/README.md index ede4d1a3b2..c20510bdfd 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ Project Website: * http://www.kamailio.org +[20 Years Of Kamailio Development: Sep 3, 2001 - Sep 3, 2021](https://www.kamailio.org/w/2021/09/kamailio-20-years-of-development/) + ## Overview Kamailio is an open source implementation of a SIP Signaling Server. SIP is an open standard protocol specified by the IETF. The core specification document is [RFC3261](https://tools.ietf.org/html/rfc3261).

1 0

[kamailio/kamailio] misc: fuzz: add msg parse fuzzer (#2842)
by DavidKorczynski 02 Sep '21

02 Sep '21

Following up on earlier work on fuzzing https://github.com/kamailio/kamailio/pull/2660 I wanted to add another fuzzer as there is still a lot more code to analyse. This fuzzer targets various parsing routines and is meant to run in the oss-fuzz infrastructure.   #### 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) - [ ] 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/2842 -- Commit Summary -- * misc: fuzz: add msg parse fuzzer -- File Changes -- A misc/fuzz/fuzz_parse_msg.c (44) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2842.patch https://github.com/kamailio/kamailio/pull/2842.diff -- 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/pull/2842

2 2

git:master:199f13a7: Merge pull request #2842 from DavidKorczynski/master
by GitHub 02 Sep '21

02 Sep '21

Module: kamailio Branch: master Commit: 199f13a7dfac8cd817850c6a6afe5ba510835418 URL: https://github.com/kamailio/kamailio/commit/199f13a7dfac8cd817850c6a6afe5ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-09-02T19:53:03+02:00 Merge pull request #2842 from DavidKorczynski/master misc: fuzz: add msg parse fuzzer --- Added: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/199f13a7dfac8cd817850c6a6afe5ba… Patch: https://github.com/kamailio/kamailio/commit/199f13a7dfac8cd817850c6a6afe5ba… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c new file mode 100644 index 0000000000..ef656abd3a --- /dev/null +++ b/misc/fuzz/fuzz_parse_msg.c @@ -0,0 +1,44 @@ +#include "../parser/sdp/sdp.h" +#include "../parser/parse_uri.c" +#include "../parser/parse_hname2.h" +#include "../parser/contact/parse_contact.h" +#include "../parser/parse_refer_to.h" +#include "../parser/parse_ppi_pai.h" +#include "../parser/parse_privacy.h" +#include "../parser/parse_diversion.h" + +int LLVMFuzzerInitialize(int *argc, char ***argv) { + ksr_hname_init_index(); + return 0; +} + +int +LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + sip_msg_t orig_inv = { }; + orig_inv.buf = (char*)data; + orig_inv.len = size; + if (parse_msg(orig_inv.buf, orig_inv.len, &orig_inv) < 0) { + goto cleanup; + } + + parse_sdp(&orig_inv); + + parse_headers(&orig_inv, HDR_TO_F, 0); + + parse_contact_header(&orig_inv); + + parse_refer_to_header(&orig_inv); + + parse_to_header(&orig_inv); + + parse_pai_header(&orig_inv); + + parse_diversion_header(&orig_inv); + + parse_privacy(&orig_inv); + +cleanup: + free_sip_msg(&orig_inv); + + return 0; +}

1 0

git:master:1e711683: misc: fuzz: add msg parse fuzzer
by David Korczynski 02 Sep '21

02 Sep '21

Module: kamailio Branch: master Commit: 1e71168342894c992ab376bf8538c0953db31fe4 URL: https://github.com/kamailio/kamailio/commit/1e71168342894c992ab376bf8538c09… Author: David Korczynski <david(a)adalogics.com> Committer: David Korczynski <david(a)adalogics.com> Date: 2021-09-02T16:00:29+01:00 misc: fuzz: add msg parse fuzzer this fuzzer targets various parsing routines and is meant to run in the oss-fuzz infrastructure. --- Added: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1e71168342894c992ab376bf8538c09… Patch: https://github.com/kamailio/kamailio/commit/1e71168342894c992ab376bf8538c09… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c new file mode 100644 index 0000000000..ef656abd3a --- /dev/null +++ b/misc/fuzz/fuzz_parse_msg.c @@ -0,0 +1,44 @@ +#include "../parser/sdp/sdp.h" +#include "../parser/parse_uri.c" +#include "../parser/parse_hname2.h" +#include "../parser/contact/parse_contact.h" +#include "../parser/parse_refer_to.h" +#include "../parser/parse_ppi_pai.h" +#include "../parser/parse_privacy.h" +#include "../parser/parse_diversion.h" + +int LLVMFuzzerInitialize(int *argc, char ***argv) { + ksr_hname_init_index(); + return 0; +} + +int +LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + sip_msg_t orig_inv = { }; + orig_inv.buf = (char*)data; + orig_inv.len = size; + if (parse_msg(orig_inv.buf, orig_inv.len, &orig_inv) < 0) { + goto cleanup; + } + + parse_sdp(&orig_inv); + + parse_headers(&orig_inv, HDR_TO_F, 0); + + parse_contact_header(&orig_inv); + + parse_refer_to_header(&orig_inv); + + parse_to_header(&orig_inv); + + parse_pai_header(&orig_inv); + + parse_diversion_header(&orig_inv); + + parse_privacy(&orig_inv); + +cleanup: + free_sip_msg(&orig_inv); + + return 0; +}

1 0

Jenkins build became unstable: kamailiodev-nightly-binaries » i386,jessie #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,jessie #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » i386,stretch #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev