sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
526 discussions

git:5.3:29ab33d4: Revert "websocket: emit core event on close"

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 29ab33d439378b9944dd63c1112afd7731ccc4de URL: https://github.com/kamailio/kamailio/commit/29ab33d439378b9944dd63c1112afd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-03T08:02:56+02:00 Revert "websocket: emit core event on close" This reverts commit 288d760f8f11e4028ccd56f4941a19e649509d65. --- Modified: src/modules/websocket/ws_conn.c --- Diff: https://github.com/kamailio/kamailio/commit/29ab33d439378b9944dd63c1112afd7… Patch: https://github.com/kamailio/kamailio/commit/29ab33d439378b9944dd63c1112afd7… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 7ffedd9be5..8570afa086 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -31,7 +31,6 @@ #include "../../core/counters.h" #include "../../core/kemi.h" #include "../../core/mem/mem.h" -#include "../../core/events.h" #include "ws_conn.h" #include "websocket.h" @@ -262,14 +261,6 @@ int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol) return 0; } -static void wsconn_run_close_callback(ws_connection_t *wsc) -{ - sr_event_param_t evp = {0}; - wsc->rcv.proto_reserved1 = wsc->id; - evp.rcv = &wsc->rcv; - sr_event_exec(SREV_TCP_WS_CLOSE, &evp); -} - static void wsconn_run_route(ws_connection_t *wsc) { int rt, backup_rt; @@ -330,8 +321,6 @@ static void wsconn_dtor(ws_connection_t *wsc) if(wsc->run_event) wsconn_run_route(wsc); - wsconn_run_close_callback(wsc); - shm_free(wsc); LM_DBG("wsconn_dtor for [%p] destroyed\n", wsc);

3 years, 7 months

git:master:9b6243d2: modules: readme files regenerated - phonenum ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9b6243d20a4dd27e44c6f7bada757226c6f4aa63 URL: https://github.com/kamailio/kamailio/commit/9b6243d20a4dd27e44c6f7bada75722… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-02T21:46:11+02:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/9b6243d20a4dd27e44c6f7bada75722… Patch: https://github.com/kamailio/kamailio/commit/9b6243d20a4dd27e44c6f7bada75722… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index ebe872869b..096a3efa4b 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -161,6 +161,13 @@ if(phonenum_match("1-484-555-8888", "src")) { letter, e.g: "DE", "US", "ES"). The function has to be called before accessing a key via: $phn(pvc=>key). + Note from libphonenumber library docs: country name code is the region + that is expected the number to be from. It is only used if the number + being parsed is not written in international format. The country code + for the number in this case would be stored as that of the region + supplied. If the number is guaranteed to start with a '+' followed by + the country calling code, then region 'ZZ'. + The parameters can be static strings or strings with variables. It can be used from ANY_ROUTE.

3 years, 7 months

[kamailio/kamailio] Parsing a number using `phonenum_match_cn()` doesn't restrict the rules with the country name code (#2495)

by Joel Serrano

### Description Parsing a number using `phonenum_match_cn()` doesn't honor the country code filter. #### Reproduction I have the following in code: ``` if (phonenum_match_cn("$fU", "PA", "src")) { if($phn(src=>valid)==1) { xlog("L_NOTICE", "Caller is type: (V=$phn(src=>valid) | N=$phn(src=>number) | NN=$phn(src=>normalized) | CC=$phn(src=>cctel) | ISO=$phn(src=>ccname) | T=$phn(src=>ltype) | D=$phn(src=>ndesc))\n"); return; } } ``` Using `+15162085XXX` as an example, I'm getting the following when passing that snippet of code: ``` Oct 1 19:31:11 sbc01 sbc[17850]: NOTICE: {1 102 INVITE 05d2e55e06832c71060e69b630cd5c6d(a)A.B.C.D} <script>: Caller is type: (V=1 | N=+15162085XXX | NN=+15162085XXX | CC=1 | ISO=US | T=fixed-line-or-mobile | D=New York) ``` I would expect this case to return `$phn(src=>valid)=0` ### Additional Information * **Kamailio version**: ``` version: kamailio 5.4.1 (x86_64/linux) 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, 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: unknown compiled with gcc 6.3.0 ``` * **Operating System**: ``` Distributor ID: Debian Description: Debian GNU/Linux 9.13 (stretch) Release: 9.13 Codename: stretch ``` -- 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/2495

3 years, 7 months

git:master:dfd6c396: phonenum: note about the role of country code name for phonenum_match_cn()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dfd6c3966ed70d111a9196076bc29767c395d814 URL: https://github.com/kamailio/kamailio/commit/dfd6c3966ed70d111a9196076bc2976… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-02T21:38:16+02:00 phonenum: note about the role of country code name for phonenum_match_cn() --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dfd6c3966ed70d111a9196076bc2976… Patch: https://github.com/kamailio/kamailio/commit/dfd6c3966ed70d111a9196076bc2976… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index d30c2026ee..f3a3e98ede 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -156,6 +156,14 @@ if(phonenum_match("1-484-555-8888", "src")) { (two letter, e.g: "DE", "US", "ES"). The function has to be called before accessing a key via: $phn(pvc=>key). </para> + <para> + Note from libphonenumber library docs: country name code is the region + that is expected the number to be from. It is only used if the number + being parsed is not written in international format. The country code + for the number in this case would be stored as that of the region + supplied. If the number is guaranteed to start with a '+' followed + by the country calling code, then region 'ZZ'. + </para> <para> The parameters can be static strings or strings with variables. </para>

3 years, 7 months

Kamailio 5.2.8 released

by Henning Westerholt

Hello, Kamailio SIP Server v5.2.8 stable release is out. This is a maintenance release of the old stable branch (5.2), that includes fixes since the release of v5.2.7. There are no change to database schema or configuration language structure that you have to do on previous installations of v5.2.x. Unless major regressions are discovered after the release, this will be the last release of the 5.2 stable branch. The current stable branches 5.3 and 5.4 will continue to be maintained. Deployments running previous v5.2.x versions are strongly recommended to be upgraded to v5.2.8. For more details about version 5.2.8 (including links and guidelines to download the tar file or from GIT repository), visit: https://www.kamailio.org/w/2020/10/kamailio-5-2-8-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

3 years, 7 months

git:5.2:5a7f5bf2: Changelog: update Changelog after fixes before release 5.2.8

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 5a7f5bf2f16941ea91c6f7db5d5955c91b745272 URL: https://github.com/kamailio/kamailio/commit/5a7f5bf2f16941ea91c6f7db5d5955c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-02T18:56:36Z Changelog: update Changelog after fixes before release 5.2.8 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/5a7f5bf2f16941ea91c6f7db5d5955c… Patch: https://github.com/kamailio/kamailio/commit/5a7f5bf2f16941ea91c6f7db5d5955c… --- diff --git a/ChangeLog b/ChangeLog index a548e4665a..eba0910895 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,30 @@ ===================== Changes Since Version 5.2.7 =========================== +commit 667ef53f1d296950f352c6e89da08b22695d87bc (HEAD -> 5.2, origin/5.2) +Author: Henning Westerholt <hw(a)skalatan.de> +Date: Fri Oct 2 18:32:56 2020 +0000 + + Revert "jansson: use the core macros for ending string value with '\0' and to restore" + + This reverts commit 61255b01f88ea904bf5694f834a5b2aec7398c69. + +commit 9c3fd4b20254302b174331acec560f809d305e44 +Author: Henning Westerholt <hw(a)skalatan.de> +Date: Fri Oct 2 18:32:39 2020 +0000 + + Revert "xcap_server: check before going to the end of the buffer" + + This reverts commit f82bdb7fadd02368133b4813cdba515a7725a31d. + +commit 28a85a330128cc1ac8e7388aeae314808c01796b +Author: Henning Westerholt <hw(a)skalatan.de> +Date: Fri Oct 2 16:49:36 2020 +0000 + + Revert "evapi: free addr info in case of bind error" + + This reverts commit e7a390388fe640d46efc640e97a87f00f1361f47. + commit 259cf0e5dd3fbeddeb1494065c742d22a8f5371e Author: Henning Westerholt <hw(a)skalatan.de> Date: Fri Oct 2 16:24:50 2020 +0000 @@ -20,6 +44,12 @@ Date: Fri Oct 2 16:22:41 2020 +0000 pkg: update debian pkg files for 5.2.8 +commit a00f1acc9c9e009f363e615bc4369341f7146ac0 +Author: Kamailio Dev <kamailio.dev(a)kamailio.org> +Date: Fri Oct 2 18:17:01 2020 +0200 + + modules: readme files regenerated - modules ... [skip ci] + commit 5a034b5b5a1e45e2c91ccf70db0b8b236f30f388 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 30 12:34:40 2020 +0200

3 years, 7 months

git:5.2:667ef53f: Revert "jansson: use the core macros for ending string value with '\0' and to restore"

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 667ef53f1d296950f352c6e89da08b22695d87bc URL: https://github.com/kamailio/kamailio/commit/667ef53f1d296950f352c6e89da08b2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-02T18:32:56Z Revert "jansson: use the core macros for ending string value with '\0' and to restore" This reverts commit 61255b01f88ea904bf5694f834a5b2aec7398c69. --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/667ef53f1d296950f352c6e89da08b2… Patch: https://github.com/kamailio/kamailio/commit/667ef53f1d296950f352c6e89da08b2… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index a5f8b1f6fd..7eceae4e96 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -26,7 +26,6 @@ #include "../../core/mod_fix.h" #include "../../core/lvalue.h" -#include "../../core/str.h" #include "jansson_path.h" #include "jansson_funcs.h" @@ -34,13 +33,13 @@ int janssonmod_get_helper(sip_msg_t* msg, str *path_s, str *src_s, pv_spec_t *dst_pv) { - char c; + pv_value_t dst_val; json_t* json = NULL; json_error_t parsing_error; - STR_VTOZ(src_s->s[src_s->len], c); + json = json_loads(src_s->s, JSON_REJECT_DUPLICATES, &parsing_error); - STR_ZTOV(src_s->s[src_s->len], c); + if(!json) { ERR("failed to parse json: %.*s\n", src_s->len, src_s->s); ERR("json error at line %d, col %d: %s\n", @@ -99,7 +98,7 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, str type_s; str value_s; str path_s; - char c; + pv_spec_t* result_pv; pv_value_t result_val; @@ -127,11 +126,14 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, result_val.rs.len = strlen("{}"); } +/* + ALERT("type is: %.*s\n", type_s.len, type_s.s); + ALERT("path is: %.*s\n", path_s.len, path_s.s); + ALERT("value is: %.*s\n", value_s.len, value_s.s); + ALERT("result is: %.*s\n", result_val.rs.len, result_val.rs.s); +*/ - LM_DBG("type is: %.*s\n", type_s.len, type_s.s); - LM_DBG("path is: %.*s\n", path_s.len, path_s.s); - LM_DBG("value is: %.*s\n", value_s.len, value_s.s); - LM_DBG("result is: %.*s\n", result_val.rs.len, result_val.rs.s); + char* result = result_val.rs.s; json_t* result_json = NULL; json_t* value = NULL; @@ -141,18 +143,14 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, /* check the type */ if(STR_EQ_STATIC(type_s, "object") || STR_EQ_STATIC(type_s, "obj")){ - STR_VTOZ(value_s.s[value_s.len], c); value = json_loads(value_s.s, JSON_REJECT_DUPLICATES, &parsing_error); - STR_ZTOV(value_s.s[value_s.len], c); if(value && !json_is_object(value)) { ERR("value to add is not an object - \"%s\"\n", path_s.s); goto fail; } }else if(STR_EQ_STATIC(type_s, "array")) { - STR_VTOZ(value_s.s[value_s.len], c); value = json_loads(value_s.s, JSON_REJECT_DUPLICATES, &parsing_error); - STR_ZTOV(value_s.s[value_s.len], c); if(value && !json_is_array(value)) { ERR("value to add is not an array - \"%s\"\n", path_s.s); goto fail; @@ -213,9 +211,9 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, } char* path = path_s.s; - STR_VTOZ(result_val.rs.s[result_val.rs.len], c); - result_json = json_loads(result_val.rs.s, JSON_REJECT_DUPLICATES, &parsing_error); - STR_ZTOV(result_val.rs.s[result_val.rs.len], c); + + result_json = json_loads(result, JSON_REJECT_DUPLICATES, &parsing_error); + if(!result_json) { ERR("result has json error at line %d: %s\n", parsing_error.line, parsing_error.text); @@ -242,7 +240,6 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, int janssonmod_array_size(struct sip_msg* msg, char* path_in, char* src_in, char* dst) { - char c; str src_s; str path_s; pv_spec_t *dst_pv; @@ -262,9 +259,9 @@ int janssonmod_array_size(struct sip_msg* msg, char* path_in, char* src_in, char json_t* json = NULL; json_error_t parsing_error; - STR_VTOZ(src_s.s[src_s.len], c); + json = json_loads(src_s.s, JSON_REJECT_DUPLICATES, &parsing_error); - STR_ZTOV(src_s.s[src_s.len], c); + if(!json) { ERR("json error at line %d: %s\n", parsing_error.line, parsing_error.text);

3 years, 7 months

git:5.2:9c3fd4b2: Revert "xcap_server: check before going to the end of the buffer"

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 9c3fd4b20254302b174331acec560f809d305e44 URL: https://github.com/kamailio/kamailio/commit/9c3fd4b20254302b174331acec560f8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-02T18:32:39Z Revert "xcap_server: check before going to the end of the buffer" This reverts commit f82bdb7fadd02368133b4813cdba515a7725a31d. --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/9c3fd4b20254302b174331acec560f8… Patch: https://github.com/kamailio/kamailio/commit/9c3fd4b20254302b174331acec560f8… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 3068356925..7405071b21 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -319,12 +319,14 @@ int xcaps_xpath_hack(str *buf, int type) } start = buf->s; - STR_VTOZ(buf->s[buf->len-1], c); - while((start < buf->s + buf->len - 8) && (p = strstr(start, match))!=NULL) { + c = buf->s[buf->len-1]; + buf->s[buf->len-1] = '\0'; + while((p = strstr(start, match))!=NULL) + { memcpy(p, repl, 7); start = p + 7; } - STR_ZTOV(buf->s[buf->len-1], c); + buf->s[buf->len-1] = c; return 0; }

3 years, 7 months

Broken: kamailio/kamailio#9433 (5.2 - 7e12d92)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #9433 Status: Broken Duration: 6 mins and 9 secs Commit: 7e12d92 (5.2) Author: Henning Westerholt Message: Changelog: update for 5.2.8 release View the changeset: https://github.com/kamailio/kamailio/compare/a00f1acc9c9e...7e12d92cdfbc View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/732317715?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

3 years, 7 months

git:5.2:28a85a33: Revert "evapi: free addr info in case of bind error"

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 28a85a330128cc1ac8e7388aeae314808c01796b URL: https://github.com/kamailio/kamailio/commit/28a85a330128cc1ac8e7388aeae3148… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-02T16:49:36Z Revert "evapi: free addr info in case of bind error" This reverts commit e7a390388fe640d46efc640e97a87f00f1361f47. --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/28a85a330128cc1ac8e7388aeae3148… Patch: https://github.com/kamailio/kamailio/commit/28a85a330128cc1ac8e7388aeae3148… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 9b3bf4e6cb..e16d4c5ad2 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -695,7 +695,6 @@ int evapi_run_dispatcher(char *laddr, int lport) sizeof(evapi_srv_addr)) < 0) { LM_ERR("cannot bind to local address and port [%s:%d]\n", laddr, lport); close(evapi_srv_sock); - freeaddrinfo(ai_res); return -1; } if (listen(evapi_srv_sock, 4) < 0) {

3 years, 7 months

← Newer
1
...
40
41
42
43
44
45
46
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020