- sr-dev - kamailio.org

git:master:7a3a5443: lcr: remove excessive conditional check in do_from_gw()
by Henning Westerholt 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 7a3a54433bbbfdb2521d4f8981c5b72423299bb1 URL: https://github.com/kamailio/kamailio/commit/7a3a54433bbbfdb2521d4f8981c5b72… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-20T20:09:58+02:00 lcr: remove excessive conditional check in do_from_gw() After an update of the bsearch(), which now supports matching not only by the IP address, but also using the 'src_port', there is no need to check, if the source port of a request matched the one from the 'lcr_gw' ('res' pointer will be NULL anyway, if ports don't match). Nor do we need to check if it's zero. --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7a3a54433bbbfdb2521d4f8981c5b72… Patch: https://github.com/kamailio/kamailio/commit/7a3a54433bbbfdb2521d4f8981c5b72… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 8c5b05d1df..23b5bce0dc 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -3035,8 +3035,7 @@ static int do_from_gw(struct sip_msg *_m, unsigned int lcr_id, /* Store tag and flags and return result */ if((res != NULL) - && ((transport == PROTO_NONE) || (res->transport_code == transport)) - && ((src_port == 0) || (res->port == src_port))) { + && ((transport == PROTO_NONE) || (res->transport_code == transport))) { LM_DBG("request came from gw\n"); if(tag_avp_param) { val.s.s = res->tag;

1 0

git:master:e82819e6: lcr: improve binary search to support a match including src port
by Henning Westerholt 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: e82819e6613dd64ca5c887759eab18cd38d20373 URL: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-20T20:09:58+02:00 lcr: improve binary search to support a match including src port Improve binary search in the lcr module and add a possibility to do a matching not only based on an IP address of a GW, but also using a source port. When a possibility to use 'src_port' parameter in from_gw() and from_any_gw() was introduced here: 14e6fc80b3d2389567c73c4a2196bf8e6d92d8d2 the bsearch() remained untouched, and hence the matching (iteration through existing GWs) is now done only based on an IP address. This leads to the issue, when there are more than one GW with the same IP address in gws table, and from_gw() and from_any_gw() functions are used with the 'src_port' parameter, it can happen that a wrong GW is picked out by bsearch() from gws table (lcr_gw) and a check by from_gw() and from_any_gw() returns False. Hence the matching based on IP address and source port is required for bsearch(), when from_gw() and from_any_gw() functions are used with the 'src_port' parameter. This means backwards compatibility is still present (when one uses functions without 'src_port'). --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… Patch: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 21f05a4730..8c5b05d1df 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -921,6 +921,30 @@ static int comp_gws(const void *_g1, const void *_g2) return memcmp(g1->ip_addr.u.addr, g2->ip_addr.u.addr, g1->ip_addr.len); } +/* + * Compare gateways based on their IP address and port + */ +static int comp_gws_include_port(const void *_g1, const void *_g2) +{ + struct gw_info *g1 = (struct gw_info *)_g1; + struct gw_info *g2 = (struct gw_info *)_g2; + + /* first address family comparison */ + if(g1->ip_addr.af < g2->ip_addr.af) + return -1; + if(g1->ip_addr.af > g2->ip_addr.af) + return 1; + if(g1->ip_addr.len < g2->ip_addr.len) + return -1; + if(g1->ip_addr.len > g2->ip_addr.len) + return 1; + + /* secondly ports comparison */ + if(g1->port != g2->port) + return -1; + + return memcmp(g1->ip_addr.u.addr, g2->ip_addr.u.addr, g1->ip_addr.len); +} /* * Insert gw info into index i or gws table @@ -2997,10 +3021,17 @@ static int do_from_gw(struct sip_msg *_m, unsigned int lcr_id, return -1; } - /* Search for gw ip address */ gw.ip_addr = *src_addr; - res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], - sizeof(struct gw_info), comp_gws); + if (src_port != 0) { + /* Search for gw based on its ip address and port */ + gw.port = src_port; + res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], + sizeof(struct gw_info), comp_gws_include_port); + } else { + /* Search for gw based on its ip address */ + res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], + sizeof(struct gw_info), comp_gws); + } /* Store tag and flags and return result */ if((res != NULL)

1 0

git:master:a9ef78b7: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: a9ef78b7f43616f2ceaa26df97eff68eb5348846 URL: https://github.com/kamailio/kamailio/commit/a9ef78b7f43616f2ceaa26df97eff68… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-20T07:31:16+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/a9ef78b7f43616f2ceaa26df97eff68… Patch: https://github.com/kamailio/kamailio/commit/a9ef78b7f43616f2ceaa26df97eff68… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index 9c861862e0..bf003d5a6e 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2021 http://www.asipto.com + Copyright Â© 2021 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -29,12 +29,20 @@ Daniel-Constantin Mierla 3.1. pos_append(idx, val) 3.2. pos_insert(idx, val) 3.3. pos_rm(idx, len) + 3.4. pos_headers_start() + 3.5. pos_headers_end() + 3.6. pos_body_start() + 3.7. pos_body_end() List of Examples 1.1. pos_append() usage 1.2. pos_insert() usage 1.3. pos_rm() usage + 1.4. pos_headers_start() usage + 1.5. pos_headers_end() usage + 1.6. pos_body_start() usage + 1.7. pos_body_end() usage Chapter 1. Admin Guide @@ -51,6 +59,10 @@ Chapter 1. Admin Guide 3.1. pos_append(idx, val) 3.2. pos_insert(idx, val) 3.3. pos_rm(idx, len) + 3.4. pos_headers_start() + 3.5. pos_headers_end() + 3.6. pos_body_start() + 3.7. pos_body_end() 1. Overview @@ -82,8 +94,12 @@ Chapter 1. Admin Guide 3.1. pos_append(idx, val) 3.2. pos_insert(idx, val) 3.3. pos_rm(idx, len) + 3.4. pos_headers_start() + 3.5. pos_headers_end() + 3.6. pos_body_start() + 3.7. pos_body_end() -3.1. pos_append(idx, val) +3.1. pos_append(idx, val) Append the value val after the position idx in the SIP message buffer. @@ -100,7 +116,7 @@ Chapter 1. Admin Guide pos_append("100", "kamailio-$si"); ... -3.2. pos_insert(idx, val) +3.2. pos_insert(idx, val) Insert the value val at the position idx in the SIP message buffer. @@ -117,7 +133,7 @@ pos_append("100", "kamailio-$si"); pos_insert("100", "kamailio-$si"); ... -3.3. pos_rm(idx, len) +3.3. pos_rm(idx, len) Remove len characters starting at the position idx in the SIP message buffer. @@ -135,3 +151,47 @@ pos_insert("100", "kamailio-$si"); ... pos_insert("100", "10"); ... + +3.4. pos_headers_start() + + Return the position in the message buffer where headers start. + + This function can be used from ANY_ROUTE. + + Example 1.4. pos_headers_start() usage +... +$var(pos) = pos_headers_start(); +... + +3.5. pos_headers_end() + + Return the position in the message buffer where headers end. + + This function can be used from ANY_ROUTE. + + Example 1.5. pos_headers_end() usage +... +$var(pos) = pos_headers_end(); +... + +3.6. pos_body_start() + + Return the position in the message buffer where body starts. + + This function can be used from ANY_ROUTE. + + Example 1.6. pos_body_start() usage +... +$var(pos) = pos_body_start(); +... + +3.7. pos_body_end() + + Return the position in the message buffer where body ends. + + This function can be used from ANY_ROUTE. + + Example 1.7. pos_body_end() usage +... +$var(pos) = pos_body_end(); +...

1 0

git:master:1e212088: core: parse identityinfo - log message on end of buffer
by Daniel-Constantin Mierla 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 1e212088091183aac8fcd418656beea523950870 URL: https://github.com/kamailio/kamailio/commit/1e212088091183aac8fcd418656beea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-20T07:22:57+02:00 core: parse identityinfo - log message on end of buffer --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/1e212088091183aac8fcd418656beea… Patch: https://github.com/kamailio/kamailio/commit/1e212088091183aac8fcd418656beea… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index da613e798f..e58bcd26ff 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -311,8 +311,12 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) return ; parseerror: - LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p,status, (int)(p-buffer), ZSW(p)); + if(p<end) { + LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", + *p, status, (int)(p-buffer), ZSW(p)); + } else { + LM_ERR("unexpected end of buffer - status %d\n", status); + } return ; }

1 0

git:master:bf6bd11a: core: parser - additioal check for content lenght spanning next line
by Daniel-Constantin Mierla 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: bf6bd11a9b969c02a106f94ebf40cefbe8028456 URL: https://github.com/kamailio/kamailio/commit/bf6bd11a9b969c02a106f94ebf40cef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-20T07:17:27+02:00 core: parser - additioal check for content lenght spanning next line --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/bf6bd11a9b969c02a106f94ebf40cef… Patch: https://github.com/kamailio/kamailio/commit/bf6bd11a9b969c02a106f94ebf40cef… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index cda4b8177d..aff70f8660 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -224,8 +224,8 @@ char* parse_content_length(char* const buffer, const char* const end, goto error; } /* search the begining of the number */ - while ( p<end && (*p==' ' || *p=='\t' || - (*p=='\n' && (*(p+1)==' '||*(p+1)=='\t')) )) + while ( p<end && (*p==' ' || *p=='\t' + || (*p=='\n' && p+1<end && (*(p+1)==' ' || *(p+1)=='\t')) ) ) p++; if (p==end) goto error;

1 0

git:master:07f48321: posops: added functions to get where the headers and body start or end
by Daniel-Constantin Mierla 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 07f48321e98e7e9f0b6f354823a11a63e3c49c05 URL: https://github.com/kamailio/kamailio/commit/07f48321e98e7e9f0b6f354823a11a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T12:58:28+02:00 posops: added functions to get where the headers and body start or end --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/07f48321e98e7e9f0b6f354823a11a6… Patch: https://github.com/kamailio/kamailio/commit/07f48321e98e7e9f0b6f354823a11a6…

1 0

git:master:5fcdbfb2: posops: added $pos(key) variable
by Daniel-Constantin Mierla 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 5fcdbfb277feb6c26becbc9398cf7e86b42e3e07 URL: https://github.com/kamailio/kamailio/commit/5fcdbfb277feb6c26becbc9398cf7e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-19T09:24:39+02:00 posops: added $pos(key) variable - get attributes related to posops --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5fcdbfb277feb6c26becbc9398cf7e8… Patch: https://github.com/kamailio/kamailio/commit/5fcdbfb277feb6c26becbc9398cf7e8…

1 0

[kamailio/kamailio] xhttp_prom: added prom_counter_dec function (#2858)
by sergey-safarov 17 Sep '21

17 Sep '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 I use dialog module and want to export current active calls with custom labels. I need to decrement the counter value when a call is terminated. `prom_counter_dec` add this functionality. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2858 -- Commit Summary -- * xhttp_prom: introduced prom_counter_update * xhttp_prom: replaced prom_counter_inc by prom_counter_update * xhttp_prom: added prom_counter_dec function * xhttp_prom: added rpc_prom_counter_dec * xhttp_prom: counter_dec published via KEMI interface * xhttp_prom: docbook - fixed 'Document root element "chapter", must match DOCTYPE root "book".' * xhttp_prom: docubook ulink elementdo not alloed inside listitem element * xhttp_prom: docbook para element not allowed inside another para element * xhttp_prom: docbook files space formating * xhttp_prom: added prom_counter_dec docbook description -- File Changes -- M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (1151) M src/modules/xhttp_prom/prom_metric.c (29) M src/modules/xhttp_prom/prom_metric.h (4) M src/modules/xhttp_prom/xhttp_prom.c (324) M src/modules/xhttp_prom/xhttp_prom.h (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2858.patch https://github.com/kamailio/kamailio/pull/2858.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/2858

2 3

git:5.4:baed0ff2: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 17 Sep '21

17 Sep '21

Module: kamailio Branch: 5.4 Commit: baed0ff2c8b396e7d062e59aed856605c50e8d96 URL: https://github.com/kamailio/kamailio/commit/baed0ff2c8b396e7d062e59aed85660… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-17T09:31:50+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/baed0ff2c8b396e7d062e59aed85660… Patch: https://github.com/kamailio/kamailio/commit/baed0ff2c8b396e7d062e59aed85660… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index a0e1f48d8d..5951c70f4c 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -543,17 +543,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. ... @@ -564,11 +564,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: new commits in branch 5.4
by Daniel-Constantin Mierla 17 Sep '21

17 Sep '21

- URL: https://github.com/kamailio/kamailio/commit/69819531b532fdec7956c0c28e1ea1a… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-09-17T09:02:59+02:00 core: enables compilation with debug symbols by default for other architectures - enables compilation with debug symbols by default for other architectures in core - pull request GH #2811 - closes GH #2789 (cherry picked from commit ed46adad82e7b6569eb42704c5460263d2af75f7) (cherry picked from commit ba8a06d2988e41b09947d3ae3386a13e3d8415b9) - URL: https://github.com/kamailio/kamailio/commit/e9272d8d67b9f8f9e04ad511ae01457… Author: FredWH <wh720(a)139.com> Date: 2021-09-17T09:03:24+02:00 db_redis: fix broken pipe issue, if redis server with timeout setting. - issue #2764 (cherry picked from commit 7cec977f8e12bbeb0309d903e02461d1ccbf41a8) (cherry picked from commit 48eb41654859e6130c82c46400b529f2af9ce908) - URL: https://github.com/kamailio/kamailio/commit/e5785361cad74949bde08386b857c13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:04:04+02:00 core: parser sdp - shorten debug message with sdp line - was printing the rest of the body, print now max 20 chars (cherry picked from commit 4191a8193025499df64f13d59f5716563e573161) (cherry picked from commit ede5a8399662903c2aa081b7010603398a598e94) - URL: https://github.com/kamailio/kamailio/commit/7fd662c98aa14d9b2fb730cfce0f639… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:04:31+02:00 sdpops: refactored sdp_remove_str_codec_id_attrs() - line oriented matching of codec addributes - support to remove a=rtcp-fb per codec, GH #2755 (cherry picked from commit 1a15a18eacd5764e9ba6240acbe37e645368f825) (cherry picked from commit 96f24caed768b1b382b166eea835e555eac5e933) - URL: https://github.com/kamailio/kamailio/commit/fa2c7c16881b25bb99a33f69b67bda9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:04:44+02:00 misc/tools/protoshoot: removed svn id and history (cherry picked from commit e3875c01adf576f179374a926e69e99c0094e5b4) (cherry picked from commit 105b15422f611ba1dcc59be30f7f4d474b294d03) - URL: https://github.com/kamailio/kamailio/commit/984af7311243de4ea5358236d43346e… Author: lazedo <luis.azedo(a)factorlusitano.com> Date: 2021-09-17T09:05:12+02:00 tm: restore xavps & flags after rebuilding message (cherry picked from commit 7ee642c58991e594f38247ab0751fadd07ce758c) (cherry picked from commit ad5f0f522f43a69e0f7f930cac5aefc3f21607df) - URL: https://github.com/kamailio/kamailio/commit/0f0fd6f7d9997bceafb3a2034a15cab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:05:28+02:00 core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes - set the values of IP4_MAX_STR_SIZE and IP6_MAX_STR_SIZE based on them, if defined, or to 15 and 45 - cope with IPv6 with IPv4 tunneling representation (RFC 4291 section 2.2) - cover the requirements of using inet_ntop() - GH #2823 (cherry picked from commit 22a72f3a7725d56f00e22bdc52d44bd53da7c091) (cherry picked from commit 680d98caccc0216f43c2b5de83935dbc4853ab9d) - URL: https://github.com/kamailio/kamailio/commit/4ce1fc01f916a0ee45aff75a18de67f… Author: Alan Evans <alan(a)kageds.com> Date: 2021-09-17T09:05:44+02:00 kazoo : fix routing of reply events success events should be routed to onreply_route[] failure events should be routed to failure_route[] (cherry picked from commit fb2eee3e175040fef5e76cbed11430976f62df32) (cherry picked from commit d8ff1845c34a7f9d8e6911ae3d2055b122eb3b79) - URL: https://github.com/kamailio/kamailio/commit/f619ef65ce925b7273fc253feb9ca66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:06:01+02:00 drouting: added dr_ prefix to internal time recurrence functions - avoids symbol conflicts with the core tmrec.c - GH #2828 (cherry picked from commit 33ea38f35f9911a26a757dbfa22065eb80a9a24a) (cherry picked from commit b49f23af03d5e2f0364610739e7ef6e07cfd54a5) - URL: https://github.com/kamailio/kamailio/commit/9825c3da237394fb2b856e41a593b8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:06:13+02:00 cplc: use cpl_ prefix for internal time recurrence functions - avoid global symbol conflicts with core tmrec.c - GH #2827 (cherry picked from commit 431544864c97d1848db1c0c42a03251a214f04cd) (cherry picked from commit 7e3e0a81bf458bd90bc1454c81bf21d64ed9212c) - URL: https://github.com/kamailio/kamailio/commit/b0a7811ef60d8fee47db4535cdc84c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:06:51+02:00 core: check message rcv and snd proto for diff realms lump conditions - in addition to receive socket and send socket protos, which may be the same in cases of tcp/tls+ws/wss using same ports (cherry picked from commit 871f8113612148a49e69218e70ed7f475fb665db) (cherry picked from commit 52978a0873eb068be31ca0688e64c88e4872efac) - URL: https://github.com/kamailio/kamailio/commit/565b43d1d0572a8b68188cacf5b8248… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:07:16+02:00 core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps - besides comparing the protos of rcv and snd sockets (cherry picked from commit 31377b160df563a222bec5a1bf92590635429240) (cherry picked from commit de84b32eb42e19f8626947da1c567eea2d0869fb) - URL: https://github.com/kamailio/kamailio/commit/a564c8d2e88b58948f2e1ea01008ec8… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-09-17T09:08:22+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) (cherry picked from commit ad5af6d3acd648e6bd57b923083cc26d3a3d0f57) - URL: https://github.com/kamailio/kamailio/commit/f3d7a0f52152adf2b3a0da8b44b6154… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2021-09-17T09:08:41+02:00 ndb_redis: fix SIGSEGV in redisc_check_auth - Added the check for NULL pointer. When TCP session to redis reset, redisCommand function can return NULL pointer. (cherry picked from commit c32a0be89cc92a0649277774d1e7aebf349b8b49) (cherry picked from commit 5dbf99eb03aba76905aa926a55aedd3caa0fcd05) - URL: https://github.com/kamailio/kamailio/commit/c5a3dc8e58b4653ad488a373b5760bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:08:52+02:00 dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW (cherry picked from commit b86d2490f3b96c532cbe07259786757b3ab9fc02) (cherry picked from commit 0c9d7e3378a4e3ffb1e6a7e48f89b7649aaa6fb2) - URL: https://github.com/kamailio/kamailio/commit/6061def6d5550c9686f1b76d4d09400… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:09:05+02:00 sca: call unsafe find entry function to avoid infinite recursion (cherry picked from commit bd92fb59cce183008956ff060911cc14d3dfb160) (cherry picked from commit b6380374f310a26c8a36f807d97ff0f415204be4) - URL: https://github.com/kamailio/kamailio/commit/0f9141a4ac722e1c33fbd597ef85c92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:09:20+02:00 tm: skip body operation on empty string for uac building (cherry picked from commit 34b61d3f1d6b5a0d4425f8edfa69d707cfa058b7) (cherry picked from commit d96e3527c20791cb2291aa91685d5bc85606eb56) - URL: https://github.com/kamailio/kamailio/commit/7e325b0a8cc6a80cd9173f07ac1e9c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:09:34+02:00 presence: skip body operations on empty string (cherry picked from commit c849070371740c01f9f13a889c610de9132349f3) (cherry picked from commit b0125b66116468b1e5d0dd2ee4eb0eebb4e7ecb4) - URL: https://github.com/kamailio/kamailio/commit/bbd5a5ce5b2269e6e29f63a8cd73838… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:09:47+02:00 usrloc: set tcp connection id to -1 for records added via rpc - cope properly with the handle_lost_tcp modparam (cherry picked from commit a0a97119bef7671f33734399dc9de4562abae39c) (cherry picked from commit 1685ebd5917e763c347b6d4201b19b72e2ee274e) - URL: https://github.com/kamailio/kamailio/commit/0ea368063362c090485dddaacf03a6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:10:04+02:00 core: print char code on error in parse_addr_spec() (cherry picked from commit 031fd46980b34a570385f49f168b13af43d84b87) (cherry picked from commit 86c5d807ceb896dcc554bf8f1b7fb93c68e69a73) - URL: https://github.com/kamailio/kamailio/commit/28251b9233b5011b36423717c054093… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:10:18+02:00 core: parse content length - consider multi line header format - safety checks for log message when not parsing the message buffer (cherry picked from commit baed515e8aed8e5b505ff716eb57d0c60e582632) (cherry picked from commit c19e43e7bfa7d88b49312f1e83c3aae0756e4ae5) - URL: https://github.com/kamailio/kamailio/commit/99dd461fb14c2eb3803d7708c229bb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:10:39+02:00 core: parser - free local unused param structure (cherry picked from commit 116ef94420bf6ed9e0ae3bc08a612d8d0c4aa0a7) (cherry picked from commit 479a6669da3bd03a9bd54ea4612192ee0b31f86a) - URL: https://github.com/kamailio/kamailio/commit/61d80860ead2adf93ffecb1318048bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:10:51+02:00 core: parser - ensure content lenght value does not exceed max int (cherry picked from commit f769011743feccde0fbca8531ab4e1b3563bf155) (cherry picked from commit cd4c6ef6022fa6b4453c9e2feb091d3dd7776311) - URL: https://github.com/kamailio/kamailio/commit/307f429ec4c1512018540cf58885b2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:11:02+02:00 core: catch empty string on parsing params (cherry picked from commit 76e6033ff14fec0f2db0b387803b4c5815a91163) (cherry picked from commit d40de01737781f12cb2383a2891c8590cfb7deba) - URL: https://github.com/kamailio/kamailio/commit/f0d7b3a3d6c2aa27e47c87ec58b31c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:11:38+02:00 core: parser contact - link structure once finishing current one (cherry picked from commit d6c52a6afdd38cc05a67a25e55e387ad77a9ddf4) (cherry picked from commit 9ed8820aaf307a756f1f08ccff4459884f62b9a8) - URL: https://github.com/kamailio/kamailio/commit/6120013b0821e9420254b083d6eb4f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:11:50+02:00 core: parser contact - proper update of length in skip_name() - stop walking name also for unquoted ;, being special char - small typo (cherry picked from commit 20db418f1e35f31d7a90d7cabbd22ae989b7266c) (cherry picked from commit a0d7837c934df7f4c2223ca7f90f7c439628caf4) - URL: https://github.com/kamailio/kamailio/commit/a7143e95b407d53714ed0113e243032… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:12:03+02:00 core: log unexpected char in parse_param2() (cherry picked from commit a2511df29adc83544f047cbbdba7a8ba88272930) (cherry picked from commit c6bfa8d8ee14ea27158f09f3b0a04015a1252e1a) - URL: https://github.com/kamailio/kamailio/commit/4f438e01d4e6c6042026e9c5f673e1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:12:14+02:00 core: parser - free unlinked local param structure in parse_to_param() (cherry picked from commit f624e1701088a94465a06f36a2ef27804b16ec0e) (cherry picked from commit 04c7d84874bf60dabede57adb1fc64ebe2260420) - URL: https://github.com/kamailio/kamailio/commit/d94bed817ffd389b5e528c124e2a841… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:12:27+02:00 core: parse_to_param() check for end of data on escape or start of value (cherry picked from commit 17a2eec2a8e47939782c1352ddb0fa4d3e73f9d8) (cherry picked from commit 92083402b2768b0ab81072feefd94bf754730e7f) - URL: https://github.com/kamailio/kamailio/commit/816f7b42b8527a2edc621143d2f1fae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:12:49+02:00 core: parse content - group operation to avoid overflow (cherry picked from commit 685817088ff9c72c055e72091fa6f923b824c206) (cherry picked from commit 796e2b203bbe09c6eb30321c579651d96c9b5de5) - URL: https://github.com/kamailio/kamailio/commit/0daa378326ea967bda8e302ac183463… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:13:03+02:00 core: parse via - safe check for end of buffer - just in case it is needed to be used for non-zero-terminated strings (cherry picked from commit 1d3fde1205440296c1d6a54feee5a9d637055bee) (cherry picked from commit 5a73c4b2363a533f8a9ed67aff3413223815c52c) - URL: https://github.com/kamailio/kamailio/commit/0616c676ca0e0e6e013ce26a53e951b… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-09-17T09:13:16+02:00 kazoo: fixed crash when json body is NULL fixes GH #2794 (cherry picked from commit d8955fc350b48d0c4ca359d03cb9954a48998658) (cherry picked from commit abbf1fde2efd02f24c806a5be296e4648060b0af) - URL: https://github.com/kamailio/kamailio/commit/d8ef550a4e7181f7fce1a4982c5da10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:13:27+02:00 core: free params list at end on error state inside parse_addr_spec (cherry picked from commit f2b133e24e29f9f0ce7ba568a5d4564c7b0f8f31) (cherry picked from commit b44879a17af848c3acb5524fe1058854c59c95fd) - URL: https://github.com/kamailio/kamailio/commit/09370e77e42a287246df46728c85a8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:13:40+02:00 dispatcher: init attrs value when param not given to rpc add - GH #2854 (cherry picked from commit 7894fb470e707622b077d565763c9cfb7c654da5) (cherry picked from commit 55312a08806027850840cf5b1f69ec7469965730) - URL: https://github.com/kamailio/kamailio/commit/730167bf4e26ba44bf69275730efbf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:14:01+02:00 core: parser - print what is left in buffer if no EoH in get_body() (cherry picked from commit 63ecb827631189d27da6a85d41149985d95fc479) (cherry picked from commit 4578fb676177e16324c2241820cf5f8042503a37) - URL: https://github.com/kamailio/kamailio/commit/a5340f49d21cb4dede9c84fe099561d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T09:14:23+02:00 sqlops: return 1 on success for kemi sql_xquery() - GH #2856 (cherry picked from commit 32bf3eb2b27fbefe991a4aabc829f21ecc4e8829) (cherry picked from commit c1f5595eaf0b1f98cb5dcc00ab68c0e57bc4b053)

1 0

git:master:6208d8a0: core: receive - check for required headers before routing blocks
by Daniel-Constantin Mierla 17 Sep '21

17 Sep '21

Module: kamailio Branch: master Commit: 6208d8a0e31fa03ca24bc2fd63093607d235dbbd URL: https://github.com/kamailio/kamailio/commit/6208d8a0e31fa03ca24bc2fd6309360… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-17T08:22:09+02:00 core: receive - check for required headers before routing blocks --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/6208d8a0e31fa03ca24bc2fd6309360… Patch: https://github.com/kamailio/kamailio/commit/6208d8a0e31fa03ca24bc2fd6309360… --- diff --git a/src/core/receive.c b/src/core/receive.c index f3b31fefbc..b3e6aee8b8 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -421,9 +421,13 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) if(msg->first_line.type == SIP_REQUEST) { ruri_mark_new(); /* ruri is usable for forking (not consumed yet) */ if(!IS_SIP(msg)) { + LM_DBG("handling non-sip request message\n"); if((ret = nonsip_msg_run_hooks(msg)) != NONSIP_MSG_ACCEPT) { - if(unlikely(ret == NONSIP_MSG_ERROR)) + if(unlikely(ret == NONSIP_MSG_ERROR)) { + LM_DBG("failed handling non-sip request message\n"); goto error03; + } + LM_DBG("finished handling non-sip request message\n"); goto end; /* drop the message */ } } @@ -435,6 +439,14 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) STATS_BAD_MSG(); goto error02; } + if(unlikely((msg->callid == 0) || (msg->cseq == 0) || (msg->from == 0) + || (msg->to == 0))) { + /* no required headers -- send back error ? */ + LOG(cfg_get(core, core_cfg, sip_parser_log), + "required headers not found in request\n"); + STATS_BAD_MSG(); + goto error02; + } /* check if necessary to add receive?->moved to forward_req */ /* check for the alias stuff */ #ifdef USE_TCP @@ -526,6 +538,14 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) STATS_BAD_RPL(); goto error02; } + if(unlikely((msg->callid == 0) || (msg->cseq == 0) || (msg->from == 0) + || (msg->to == 0))) { + /* no required headers -- send back error ? */ + LOG(cfg_get(core, core_cfg, sip_parser_log), + "required headers not found in reply\n"); + STATS_BAD_RPL(); + goto error02; + } if(exectime) { gettimeofday(&tvb, NULL);

1 0

[kamailio/kamailio] How to get $fU and $tU from MSRP module? (#2857)
by w415384914 17 Sep '21

17 Sep '21

Hello! I want to get $fU and $tU from event_route[msrp:frame-in] in order to filter out MSRP messages sent by a specific sender and received by a specific receiver, I know I can get message content from $msrp(buf), the message content is like this: > MSRP 7a57f552155926c0 SEND > To-Path: msrp://172.18.0.14:6060/9d8da4a34dc2102959e7;tcp msrp://172.18.0.12:5060/msrp-6142fc2b-84-1;tcp msrp://172.18.0.2:34862/2a67b54ae0750b7d82aa;tcp > From-Path: msrp://172.18.0.14:6060/c71ae3675e114d08216b;tcp msrp://172.18.0.12:5060/msrp-6142fc2b-83-1;tcp msrp://172.18.0.2:34858/8baea7c52ba8755322fd;tcp > Byte-Range: 1-197/197 > Failure-Report: yes > Success-Report: yes > Message-ID: c792c94039b8a969 > Content-Type: message/cpim > > From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> > To: <sip:bob@ims.mnc001.mcc001.3gppnetwork.org> > DateTime: 2021-09-16T09:23:49.339805+00:00 > > MIME-Version: 1.0 > Content-Type: text/plain > > hello > -------7a57f552155926c0$ I want to get alice and bob from the content below： > From: <sip:alice@ims.mnc001.mcc001.3gppnetwork.org> > To: <sip:bob@ims.mnc001.mcc001.3gppnetwork.org> > DateTime: 2021-09-16T09:23:49.339805+00:00 someone can suggest some method. In other route like request_route we can use $fU and $tU to access them. Regrads HANG LI -- 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/2857

2 2

git:master:698417d9: modules: readme files regenerated - slack ... [skip ci]
by Kamailio Dev 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 698417d9704413fa8e58b1ee53e728efe1c02f34 URL: https://github.com/kamailio/kamailio/commit/698417d9704413fa8e58b1ee53e728e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-16T14:01:17+02:00 modules: readme files regenerated - slack ... [skip ci] --- Modified: src/modules/slack/README --- Diff: https://github.com/kamailio/kamailio/commit/698417d9704413fa8e58b1ee53e728e… Patch: https://github.com/kamailio/kamailio/commit/698417d9704413fa8e58b1ee53e728e… --- diff --git a/src/modules/slack/README b/src/modules/slack/README index 58203e80fb..22ede72ebc 100644 --- a/src/modules/slack/README +++ b/src/modules/slack/README @@ -4,7 +4,7 @@ Arsen Semenov <arsperger(a)gmail.com> - Copyright © 2021 arsperger.com + Copyright Â© 2021 arsperger.com __________________________________________________________________ Table of Contents @@ -22,7 +22,7 @@ Arsen Semenov 3.1. slack url (str) 3.2. channel (str) 3.3. username (str) - 3.4. icon_emogi (str) + 3.4. icon_emoji (str) 4. Functions @@ -33,7 +33,7 @@ Arsen Semenov 1.1. Set slack webhook URL parameter 1.2. Set channel parameter 1.3. Set username parameter - 1.4. Set icon_emogi parameter + 1.4. Set icon_emoji parameter 1.5. slack_send usage Chapter 1. Admin Guide @@ -51,7 +51,7 @@ Chapter 1. Admin Guide 3.1. slack url (str) 3.2. channel (str) 3.3. username (str) - 3.4. icon_emogi (str) + 3.4. icon_emoji (str) 4. Functions @@ -62,7 +62,7 @@ Chapter 1. Admin Guide This module provides integration with Slack over webhooks. Slack integration (https://api.slack.com/messaging/webhooks) - It relays on libcurl. library (https://curl.se/libcurl). + It relays on libcurl through http_client module. 2. Dependencies @@ -72,7 +72,7 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules The following modules must be loaded before this module: - * none. + * HTTP_CLIENT - the http_client module should be loaded first. 2.2. External Libraries or Applications @@ -85,7 +85,7 @@ Chapter 1. Admin Guide 3.1. slack url (str) 3.2. channel (str) 3.3. username (str) - 3.4. icon_emogi (str) + 3.4. icon_emoji (str) 3.1. slack url (str) @@ -121,16 +121,16 @@ modparam("slack", "channel", "#kamailio") modparam("slack", "username", "webhookbot") ... -3.4. icon_emogi (str) +3.4. icon_emoji (str) specify an emoji (using colon shortcodes, eg. :white_check_mark:) to use as the profile photo alongside the message. Default value is :ghost: - Example 1.4. Set icon_emogi parameter + Example 1.4. Set icon_emoji parameter ... -modparam("slack", "icon_emogi", ":ghost:") +modparam("slack", "icon_emoji", ":ghost:") ... 4. Functions

1 0

git:master:996bc9cc: slack: update readme docs [skip ci]
by Arsen Semenov 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 996bc9ccecdb2a5a41fb006306eefe3b384c6812 URL: https://github.com/kamailio/kamailio/commit/996bc9ccecdb2a5a41fb006306eefe3… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Arsen Semenov <arsperger(a)gmail.com> Date: 2021-09-16T16:56:58+05:00 slack: update readme docs [skip ci] --- Modified: src/modules/slack/doc/slack_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/996bc9ccecdb2a5a41fb006306eefe3… Patch: https://github.com/kamailio/kamailio/commit/996bc9ccecdb2a5a41fb006306eefe3… --- diff --git a/src/modules/slack/doc/slack_admin.xml b/src/modules/slack/doc/slack_admin.xml index fa8e6cf6b6..f7b1f4071c 100644 --- a/src/modules/slack/doc/slack_admin.xml +++ b/src/modules/slack/doc/slack_admin.xml @@ -20,7 +20,7 @@ Slack integration (https://api.slack.com/messaging/webhooks) </para> <para> - It relays on libcurl. library (https://curl.se/libcurl). + It relays on libcurl through http_client module. </para> </section> @@ -29,15 +29,14 @@ <section> <title>&kamailio; Modules</title> <para> - The following modules must be loaded before this module: + The following modules must be loaded before this module: <itemizedlist> - <listitem> - <para> - <emphasis>none</emphasis>. - </para> - </listitem> + <listitem><para> + HTTP_CLIENT - the http_client module should be + loaded first. + </para></listitem> </itemizedlist> - </para> + </para> </section> <section> <title>External Libraries or Applications</title> @@ -47,7 +46,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libcurl</emphasis> + <emphasis>&libcurl;</emphasis> </para> </listitem> </itemizedlist>

1 0

git: new commits in branch 5.5
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

- URL: https://github.com/kamailio/kamailio/commit/86c5d807ceb896dcc554bf8f1b7fb93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:04:54+02:00 core: print char code on error in parse_addr_spec() (cherry picked from commit 031fd46980b34a570385f49f168b13af43d84b87) - URL: https://github.com/kamailio/kamailio/commit/e50f95cda2190f29cc572ebc90b4d0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:05:04+02:00 app_ruby: utils/app_ruby_ctl - increade api skeleton functions to 1536 (cherry picked from commit cfb5c453caaee341dc4ee1d9f2cdc5b1c3c87eea) - URL: https://github.com/kamailio/kamailio/commit/44c9608c1d1c82439e76dda861362b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:05:14+02:00 app_ruby: regenerated api skeleton functions (cherry picked from commit 8b128b7dd544e3e30d615da39e84cec91588249a) - URL: https://github.com/kamailio/kamailio/commit/c19e43e7bfa7d88b49312f1e83c3aae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:06:38+02:00 core: parse content length - consider multi line header format - safety checks for log message when not parsing the message buffer (cherry picked from commit baed515e8aed8e5b505ff716eb57d0c60e582632) - URL: https://github.com/kamailio/kamailio/commit/479a6669da3bd03a9bd54ea4612192e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:07:01+02:00 core: parser - free local unused param structure (cherry picked from commit 116ef94420bf6ed9e0ae3bc08a612d8d0c4aa0a7) - URL: https://github.com/kamailio/kamailio/commit/cd4c6ef6022fa6b4453c9e2feb091d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:07:11+02:00 core: parser - ensure content lenght value does not exceed max int (cherry picked from commit f769011743feccde0fbca8531ab4e1b3563bf155) - URL: https://github.com/kamailio/kamailio/commit/d40de01737781f12cb2383a2891c859… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:07:27+02:00 core: catch empty string on parsing params (cherry picked from commit 76e6033ff14fec0f2db0b387803b4c5815a91163) - URL: https://github.com/kamailio/kamailio/commit/62e8b4571f746819f460ae83b95e95e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:07:56+02:00 core: relocate parse_contact_hader() to parser folder (cherry picked from commit d2dbe98e072f59138b9974ab8f147bcfef5f983e) - URL: https://github.com/kamailio/kamailio/commit/9ed8820aaf307a756f1f08ccff44598… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:08:05+02:00 core: parser contact - link structure once finishing current one (cherry picked from commit d6c52a6afdd38cc05a67a25e55e387ad77a9ddf4) - URL: https://github.com/kamailio/kamailio/commit/a0d7837c934df7f4c2223ca7f90f7c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:08:35+02:00 core: parser contact - proper update of length in skip_name() - stop walking name also for unquoted ;, being special char - small typo (cherry picked from commit 20db418f1e35f31d7a90d7cabbd22ae989b7266c) - URL: https://github.com/kamailio/kamailio/commit/c6bfa8d8ee14ea27158f09f3b0a0401… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:08:46+02:00 core: log unexpected char in parse_param2() (cherry picked from commit a2511df29adc83544f047cbbdba7a8ba88272930) - URL: https://github.com/kamailio/kamailio/commit/04c7d84874bf60dabede57adb1fc64e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:09:43+02:00 core: parser - free unlinked local param structure in parse_to_param() (cherry picked from commit f624e1701088a94465a06f36a2ef27804b16ec0e) - URL: https://github.com/kamailio/kamailio/commit/92083402b2768b0ab81072feefd94bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:10:00+02:00 core: parse_to_param() check for end of data on escape or start of value (cherry picked from commit 17a2eec2a8e47939782c1352ddb0fa4d3e73f9d8) - URL: https://github.com/kamailio/kamailio/commit/796e2b203bbe09c6eb30321c579651d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:12:05+02:00 core: parse content - group operation to avoid overflow (cherry picked from commit 685817088ff9c72c055e72091fa6f923b824c206) - URL: https://github.com/kamailio/kamailio/commit/5a73c4b2363a533f8a9ed67aff34132… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:12:17+02:00 core: parse via - safe check for end of buffer - just in case it is needed to be used for non-zero-terminated strings (cherry picked from commit 1d3fde1205440296c1d6a54feee5a9d637055bee) - URL: https://github.com/kamailio/kamailio/commit/abbf1fde2efd02f24c806a5be296e46… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-09-16T13:12:57+02:00 kazoo: fixed crash when json body is NULL fixes GH #2794 (cherry picked from commit d8955fc350b48d0c4ca359d03cb9954a48998658) - URL: https://github.com/kamailio/kamailio/commit/b44879a17af848c3acb5524fe105885… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:13:08+02:00 core: free params list at end on error state inside parse_addr_spec (cherry picked from commit f2b133e24e29f9f0ce7ba568a5d4564c7b0f8f31) - URL: https://github.com/kamailio/kamailio/commit/55312a08806027850840cf5b1f69ec7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:13:20+02:00 dispatcher: init attrs value when param not given to rpc add - GH #2854 (cherry picked from commit 7894fb470e707622b077d565763c9cfb7c654da5) - URL: https://github.com/kamailio/kamailio/commit/4578fb676177e16324c2241820cf5f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:13:39+02:00 core: parser - print what is left in buffer if no EoH in get_body() (cherry picked from commit 63ecb827631189d27da6a85d41149985d95fc479) - URL: https://github.com/kamailio/kamailio/commit/c1f5595eaf0b1f98cb5dcc00ab68c0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:13:53+02:00 sqlops: return 1 on success for kemi sql_xquery() - GH #2856 (cherry picked from commit 32bf3eb2b27fbefe991a4aabc829f21ecc4e8829)

1 0

[kamailio/kamailio] KSR.sqlops.sql_xquery() return 0 when successful, but 1 expected (#2856)
by hance2010 16 Sep '21

16 Sep '21

### Description  ### Troubleshooting ``` # kamailio.cfg sql = "select * from subscriber"; sql_xquery("ca", sql, "ra"); xinfo("returncode = $rc"); /* 1 */ # kamailio.lua sql = "select * from subscriber" rc = KSR.sqlops.sql_xquery("ca", sql, "ra") KSR.info("returncode = " .. rc .. "\n") -- 0, but 1 expected ``` #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.5.1 ``` * **Operating System**:  ``` debian10 ``` -- 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/2856

2 2

git:master:32bf3eb2: sqlops: return 1 on success for kemi sql_xquery()
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 32bf3eb2b27fbefe991a4aabc829f21ecc4e8829 URL: https://github.com/kamailio/kamailio/commit/32bf3eb2b27fbefe991a4aabc829f21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T13:00:20+02:00 sqlops: return 1 on success for kemi sql_xquery() - GH #2856 --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/32bf3eb2b27fbefe991a4aabc829f21… Patch: https://github.com/kamailio/kamailio/commit/32bf3eb2b27fbefe991a4aabc829f21… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index d67f30ccef..63c035ca89 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -954,7 +954,7 @@ int sqlops_do_xquery(sip_msg_t *msg, str *scon, str *squery, str *xavp) if(sql_exec_xquery(msg, con, squery, xavp)<0) goto error; - return 0; + return 1; error: return -1; }

1 0

git:master:b8d3971a: slack: reuse http_client api
by Arsen Semenov 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: b8d3971ab7d2d5d913f629b142dded6322a82172 URL: https://github.com/kamailio/kamailio/commit/b8d3971ab7d2d5d913f629b142dded6… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Arsen Semenov <arsperger(a)gmail.com> Date: 2021-09-16T15:42:24+05:00 slack: reuse http_client api --- Modified: src/modules/slack/Makefile Modified: src/modules/slack/slack.c Modified: src/modules/slack/slack.h --- Diff: https://github.com/kamailio/kamailio/commit/b8d3971ab7d2d5d913f629b142dded6… Patch: https://github.com/kamailio/kamailio/commit/b8d3971ab7d2d5d913f629b142dded6…

1 0

[kamailio/kamailio] `rpc dispatcher.add group address flags` not work (#2854)
by hance2010 16 Sep '21

16 Sep '21

### Description  kamcmd dispatcher add 1 sip:1.2.3.4 # work kamcmd dispatcher add 1 sip:1.2.3.4 8 maxload=20 # work but, kamcmd dispatcher add 1 sip:1.2.3.4 8 # not work ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` kamailio 5.5.2 ``` (paste your output here) ``` * **Operating System**: Debian10  ``` (paste your output here) ``` -- 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/2854

2 4

git:master:63ecb827: core: parser - print what is left in buffer if no EoH in get_body()
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 63ecb827631189d27da6a85d41149985d95fc479 URL: https://github.com/kamailio/kamailio/commit/63ecb827631189d27da6a85d4114998… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T11:03:52+02:00 core: parser - print what is left in buffer if no EoH in get_body() --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/63ecb827631189d27da6a85d4114998… Patch: https://github.com/kamailio/kamailio/commit/63ecb827631189d27da6a85d4114998… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 795c96a350..5b7fab524d 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1356,8 +1356,10 @@ char* get_body(sip_msg_t* const msg) (*(msg->unparsed)=='\n' || *(msg->unparsed)=='\r' ) ) { offset = 1; } else { - LM_ERR("failed to locate end of headers (%p %p - %d %d [%s])\n", - msg->buf, msg->unparsed, msg->len, len, msg->unparsed); + LM_ERR("failed to locate end of headers (%p %p - %d %d [%.*s])\n", + msg->buf, msg->unparsed, msg->len, len, + (len<msg->len)?(msg->len-len):0, + (len<msg->len)?msg->unparsed:""); return 0; }

1 0

git:master:489eb674: misctest: sync with fuzz msg code
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 489eb6742997f8e4f2dc56c894af6b8ed5ef4d33 URL: https://github.com/kamailio/kamailio/commit/489eb6742997f8e4f2dc56c894af6b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T11:00:56+02:00 misctest: sync with fuzz msg code --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/489eb6742997f8e4f2dc56c894af6b8… Patch: https://github.com/kamailio/kamailio/commit/489eb6742997f8e4f2dc56c894af6b8… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index 68f70718fc..0867c1ae46 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -39,10 +39,14 @@ #include "../../core/parser/parse_uri.c" #include "../../core/parser/parse_hname2.h" #include "../../core/parser/contact/parse_contact.h" +#include "../../core/parser/parse_to.h" +#include "../../core/parser/parse_from.h" #include "../../core/parser/parse_refer_to.h" #include "../../core/parser/parse_ppi_pai.h" #include "../../core/parser/parse_privacy.h" #include "../../core/parser/parse_diversion.h" +#include "../../core/parser/parse_identityinfo.h" +#include "../../core/parser/parse_disposition.h" MODULE_VERSION @@ -325,22 +329,38 @@ static int misctest_message_init(void) goto cleanup; } + parse_headers(&tmsg, HDR_EOH_F, 0); + parse_sdp(&tmsg); - parse_headers(&tmsg, HDR_TO_F, 0); + parse_from_header(&tmsg); + + parse_from_uri(&tmsg); + + parse_to_header(&tmsg); + + parse_to_uri(&tmsg); parse_contact_header(&tmsg); parse_refer_to_header(&tmsg); - parse_to_header(&tmsg); - parse_pai_header(&tmsg); parse_diversion_header(&tmsg); parse_privacy(&tmsg); + parse_content_disposition(&tmsg); + + parse_identityinfo_header(&tmsg); + + str uri; + get_src_uri(&tmsg, 0, &uri); + + str ssock; + get_src_address_socket(&tmsg, &ssock); + cleanup: free_sip_msg(&tmsg);

1 0

git:master:7894fb47: dispatcher: init attrs value when param not given to rpc add
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: 7894fb470e707622b077d565763c9cfb7c654da5 URL: https://github.com/kamailio/kamailio/commit/7894fb470e707622b077d565763c9cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T08:37:55+02:00 dispatcher: init attrs value when param not given to rpc add - GH #2854 --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/7894fb470e707622b077d565763c9cf… Patch: https://github.com/kamailio/kamailio/commit/7894fb470e707622b077d565763c9cf… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 679acbe2aa..4ed98919b7 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1854,7 +1854,7 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) { int group, flags, nparams; str dest; - str attrs; + str attrs = STR_NULL; flags = 0; @@ -1862,7 +1862,7 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) if(nparams < 2) { rpc->fault(ctx, 500, "Invalid Parameters"); return; - } else if (nparams < 3) { + } else if (nparams <= 3) { attrs.s = 0; attrs.len = 0; }

1 0

git:master:f2b133e2: core: free params list at end on error state inside parse_addr_spec
by Daniel-Constantin Mierla 16 Sep '21

16 Sep '21

Module: kamailio Branch: master Commit: f2b133e24e29f9f0ce7ba568a5d4564c7b0f8f31 URL: https://github.com/kamailio/kamailio/commit/f2b133e24e29f9f0ce7ba568a5d4564… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-16T08:08:18+02:00 core: free params list at end on error state inside parse_addr_spec --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/f2b133e24e29f9f0ce7ba568a5d4564… Patch: https://github.com/kamailio/kamailio/commit/f2b133e24e29f9f0ce7ba568a5d4564… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 99138dcaf4..1ff5a16908 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -896,6 +896,9 @@ char *parse_addr_spec(char *const buffer, const char *const end, status); goto error; } + if(to_b->error == PARSE_ERROR) { + free_to_params(to_b); + } return tmp; error:

1 0

[kamailio/kamailio] kazoo application may send zero string to kamailio this trigers crash (#2794)
by sergey-safarov 15 Sep '21

15 Sep '21

### Description I can see Kamailio cush then kazoo sends zero string as payload. Crush happens Kamailio start. #### Debugging Data ``` (gdb) bt full #0 strlen () at ../sysdeps/aarch64/strlen.S:94 No locals. #1 0x0000ffff98237274 in json_tokener_parse_ex (tok=0x1fe5a930, str=0x0, len=-1) at json_tokener.c:259 obj = 0x0 c = 1 '\001' oldlocale = 0xffffffffffffffff newloc = <optimized out> #2 0x0000ffff982b7c34 in kz_json_parse (str=0x0) at kz_json.c:285 tok = 0x1fe5a930 obj = 0x0 __func__ = "kz_json_parse" #3 0x0000ffff982a4550 in kz_amqp_consumer_event (Evt=0xffff9ce07a60) at kz_amqp.c:2427 json_obj = 0x0 #4 0x0000ffff982b1450 in kz_amqp_consumer_worker_cb (fd=16, event=2, arg=0xffffc5e8b350) at kz_amqp.c:3277 cmd = 0x0 Evt = 0xffff9ce07a60 __func__ = "kz_amqp_consumer_worker_cb" #5 0x0000ffff98193628 in event_process_active_single_queue () from /lib64/libevent-2.1.so.6 No symbol table info available. #6 0x0000ffff98193ee8 in event_base_loop () from /lib64/libevent-2.1.so.6 No symbol table info available. #7 0x0000ffff982b1878 in kz_amqp_consumer_worker_proc (cmd_pipe=16) at kz_amqp.c:3292 pipe_ev = {ev_evcallback = {evcb_active_next = {tqe_next = 0x0, tqe_prev = 0x1fb68f40}, evcb_flags = 130, evcb_pri = 0 '\000', evcb_closure = 2 '\002', evcb_cb_union = {evcb_callback = 0xffff982b080c <kz_amqp_consumer_worker_cb>, evcb_selfcb = 0xffff982b080c <kz_amqp_consumer_worker_cb>, evcb_evfinalize = 0xffff982b080c <kz_amqp_consumer_worker_cb>, evcb_cbfinalize = 0xffff982b080c <kz_amqp_consumer_worker_cb>}, evcb_arg = 0xffffc5e8b350}, ev_timeout_pos = {ev_next_with_common_timeout = {tqe_next = 0xffffffffffff, tqe_prev = 0xffffc5e8b5c0}, min_heap_idx = -1}, ev_fd = 16, ev_base = 0x1fe4e360, ev_ = {ev_io = {ev_io_next = {le_next = 0x0, le_prev = 0x1fdd0ec0}, ev_timeout = {tv_sec = 0, tv_usec = 0}}, ev_signal = {ev_signal_next = {le_next = 0x0, le_prev = 0x1fdd0ec0}, ev_ncalls = 0, ev_pncalls = 0x0}}, ev_events = 18, ev_res = 2, ev_timeout = {tv_sec = 281473255792648, tv_usec = 0}} #8 0x0000ffff98279a94 in mod_child_init (rank=0) at kazoo.c:412 pid = 0 i = 2 g = 0xffff9e491868 s = 0x8e2210 __func__ = "mod_child_init" #9 0x00000000005c93a8 in init_mod_child (m=0xffff9defe638, rank=0) at core/sr_module.c:864 __func__ = "init_mod_child" #10 0x00000000005c8f5c in init_mod_child (m=0xffff9df16b30, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #11 0x00000000005c8f5c in init_mod_child (m=0xffff9df9fde0, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #12 0x00000000005c8f5c in init_mod_child (m=0xffff9dfa03a0, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #13 0x00000000005c8f5c in init_mod_child (m=0xffff9dfa2750, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #14 0x00000000005c8f5c in init_mod_child (m=0xffff9dfa4e70, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #15 0x00000000005c8f5c in init_mod_child (m=0xffff9e09c900, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #16 0x00000000005c8f5c in init_mod_child (m=0xffff9e09df60, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #17 0x00000000005c8f5c in init_mod_child (m=0xffff9e09e608, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #18 0x00000000005c8f5c in init_mod_child (m=0xffff9e09e978, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #19 0x00000000005c8f5c in init_mod_child (m=0xffff9e09ece8, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #20 0x00000000005c8f5c in init_mod_child (m=0xffff9e3577a8, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #21 0x00000000005c8f5c in init_mod_child (m=0xffff9e358888, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #22 0x00000000005c8f5c in init_mod_child (m=0xffff9e391358, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #23 0x00000000005c8f5c in init_mod_child (m=0xffff9e45dc90, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #24 0x00000000005c8f5c in init_mod_child (m=0xffff9e483c60, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #25 0x00000000005c8f5c in init_mod_child (m=0xffff9e484190, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #26 0x00000000005c8f5c in init_mod_child (m=0xffff9e484e38, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #27 0x00000000005c8f5c in init_mod_child (m=0xffff9e4868c8, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #28 0x00000000005c8f5c in init_mod_child (m=0xffff9e4c1fb8, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #29 0x00000000005c8f5c in init_mod_child (m=0xffff9e51d880, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #30 0x00000000005c8f5c in init_mod_child (m=0xffff9e54c6c0, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #31 0x00000000005c8f5c in init_mod_child (m=0xffff9e5b3130, rank=0) at core/sr_module.c:860 __func__ = "init_mod_child" #32 0x00000000005c9d8c in init_child (rank=0) at core/sr_module.c:909 ret = -974598928 type = 0x8e4180 "PROC_MAIN" __func__ = "init_child" #33 0x0000000000431f70 in main_loop () at main.c:1849 i = 8 pid = 174778 si = 0x0 si_desc = "udp receiver child=7 sock=[2600:1f1c:6d5:aa02::c6]:5080\000\230\352\356\235\377\377\000\000\360\315\350\305\377\377\000\000\340\004S\236\377\377\000\000\020\316\350\305\377\377\000\000 \316\350\305\377\377\000\000 \316\350\305\377\377\000\000\360\315\350\305\377\377\000\000\320\377\377\377\200\377\377\377\000\355w\200t\232'\376" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #34 0x000000000043de90 in main (argc=11, argv=0xffffc5e8d3c8) at main.c:3053 cfg_stream = 0x1fae02d0 c = -1 r = 0 tmp = 0xffffc5e8fee1 "" tmp_len = 65535 port = 1 proto = 0 ahost = 0x0 aport = 0 options = 0x8ae128 ":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 = 2101103603 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xffff9f660da8 <__libc_start_main+168> "" st = {st_dev = 25, st_ino = 18714, st_mode = 16832, st_nlink = 2, st_uid = 991, st_gid = 986, st_rdev = 0, __pad1 = 0, st_size = 60, st_blksize = 65536, __pad2 = 0, st_blocks = 0, st_atim = {tv_sec = 1624850771, tv_nsec = 439999983}, st_mtim = {tv_sec = 1625171374, tv_nsec = 987883153}, st_ctim = {tv_sec = 1625171374, tv_nsec = 987883153}, __glibc_reserved = {0, 0}} tbuf = "\000\000\000\000\000\000\000\000\000\000\230\237\377\377\000\000\000\000\000\000\000\000\000\000\330\375\233\237\377\377", '\000' <repeats 58 times>, "x\376\233\237\377\377\000\000h\376\233\237\377\377\000\000\b\376\233\237\377\377\000\000(\376\233\237\377\377\000\000\070\376\233\237\377\377\000\000\250\376\233\237\377\377\000\000\270\376\233\237\377\377\000\000\310\376\233\237\377\377\000\000H\376\233\237\377\377\000\000X\376\233\237\377\377", '\000' <repeats 18 times>, "\330\375\233\237\377\377", '\000' <repeats 42 times>... option_index = 12 long_options = {{name = 0x8b04e8 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x8ab520 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x8b04f0 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x8b04f8 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x8b0500 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x8b0510 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x8b0520 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x8b0530 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x8b0540 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x8b0550 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x8b0560 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x8b0568 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x8b0578 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` Variables vlaues ``` (gdb) f 2 #2 0x0000ffff982b7c34 in kz_json_parse (str=0x0) at kz_json.c:285 285 obj = json_tokener_parse_ex(tok, str, -1); (gdb) p obj $3 = (struct json_object *) 0x0 (gdb) p *obj Cannot access memory at address 0x0 (gdb) f 3 #3 0x0000ffff982a4550 in kz_amqp_consumer_event (Evt=0xffff9ce07a60) at kz_amqp.c:2427 2427 json_obj = kz_json_parse(Evt->payload); (gdb) p *Evt $4 = {payload = 0x0, delivery_tag = 1819, channel = 6, event_key = 0x0, event_subkey = 0x0, message_id = 0xffff9cfdd600, routing_key = 0x0, cmd = 0x0} (gdb) p Evt->payload $5 = 0x0 (gdb) p *Evt->payload Cannot access memory at address 0x0 ``` ### Possible Solutions Check empty string zero inside `kz_json_parse` function and NULL if received empty string. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@bcf-e-0 ~]# kamailio -v version: kamailio 5.6.0-dev0 (aarch64/linux) f03900 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-NOSMP, 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: f03900 compiled on 17:17:36 Jun 26 2021 with gcc 8.4.1 ``` Here is master branch with my customization * **Operating System**: ``` [root@bcf-e-0 ~]# uname -a Linux bcf-e-0.la.cal911.net 4.18.0-305.3.1.el8.aarch64 #1 SMP Tue Jun 1 16:22:50 UTC 2021 aarch64 aarch64 aarch64 GNU/Linux [root@bcf-e-0 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- 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/2794

2 4

git:master:d8955fc3: kazoo: fixed crash when json body is NULL
by Sergey Safarov 15 Sep '21

15 Sep '21

Module: kamailio Branch: master Commit: d8955fc350b48d0c4ca359d03cb9954a48998658 URL: https://github.com/kamailio/kamailio/commit/d8955fc350b48d0c4ca359d03cb9954… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-09-15T16:14:13+03:00 kazoo: fixed crash when json body is NULL fixes GH #2794 --- Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/d8955fc350b48d0c4ca359d03cb9954… Patch: https://github.com/kamailio/kamailio/commit/d8955fc350b48d0c4ca359d03cb9954… --- diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 5ab8f68c79..0e5f2e8b10 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -276,6 +276,11 @@ struct json_object* kz_json_parse(const char *str) struct json_tokener* tok; struct json_object* obj; + if (str == NULL || str[0] == 0) { + LM_ERR("Error parsing json: empty string\n"); + return NULL; + } + tok = json_tokener_new(); if (!tok) { LM_ERR("Error parsing json: could not allocate tokener\n");

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev