sr-dev January 2018

sr-dev@lists.kamailio.org

35 participants
368 discussions

[kamailio/kamailio] nathelper: correct Contact received param (#1203)

by Sebastian Damm

#### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - Received param was enclosed in quotes, making some UACs stumble upon it. This fix removes the quotes, adding the received param the same way as it is done for example in the path module. - Reported by Arslan Aseed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1203 -- Commit Summary -- * nathelper: correct Contact received param -- File Changes -- M src/modules/nathelper/nathelper.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1203.patch https://github.com/kamailio/kamailio/pull/1203.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/1203

6 years, 7 months

git:master:57bd759e: nathelper: documented the use of add_rcv_param() for Contact URI case

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 57bd759e19b07647aac3bfce673131a142d9c07a URL: https://github.com/kamailio/kamailio/commit/57bd759e19b07647aac3bfce673131a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T11:58:45+01:00 nathelper: documented the use of add_rcv_param() for Contact URI case --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/57bd759e19b07647aac3bfce673131a… Patch: https://github.com/kamailio/kamailio/commit/57bd759e19b07647aac3bfce673131a… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 513c48400e..f6e061799c 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -554,11 +554,15 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; </title> <para> Add a received parameter to the <quote>Contact</quote> header fields - or the Contact URI. The parameter will contain the URI created from the - source IP, port, and protocol of the packet containing the SIP message. - The parameter can be then processed by another registrar. This is useful, - for example, when replicating register messages using <function>t_replicate</function> - function to another registrar. + (available for all transports) or to the Contact URI (available only + for UDP traffic). + </para> + <para> + The parameter will contain the URI created from the + source IP, port, and protocol (if different than UDP) of the packet + containing the SIP message. The parameter can be then processed by + another registrar. This is useful, for example, when replicating register + messages using <function>t_replicate</function> function to another registrar. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -566,7 +570,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; <emphasis>flag</emphasis> - flags to indicate if the parameter should be added to Contact URI or Contact header. If the flag is non-zero, the parameter will be added to the Contact URI. If not - used or equal to zero, the parameter will go to the Contact + used or equal to zero, the parameter will go to the Contact header. </para></listitem> </itemizedlist>

6 years, 7 months

git:master:64303a93: nathelper: add_rcv_param() - do not enclose to double quotes if URI param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 64303a9398afe65d65cf35489c04e725689a5da2 URL: https://github.com/kamailio/kamailio/commit/64303a9398afe65d65cf35489c04e72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T11:52:47+01:00 nathelper: add_rcv_param() - do not enclose to double quotes if URI param - restrict adding the param to contact URI only for UDP, otherwise a second transport parameter appears in the URI - do not enclose the value in double quotes when adding as URI param, it is not allowed by SIP specs grammar - discussed on GH PR #1203 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/64303a9398afe65d65cf35489c04e72… Patch: https://github.com/kamailio/kamailio/commit/64303a9398afe65d65cf35489c04e72… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 168bae09cc..a45588a50d 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2110,9 +2110,13 @@ static int ki_add_rcv_param(sip_msg_t *msg, int upos) struct lump *anchor; char *param; str uri; - int hdr_param; - hdr_param = (upos)?0:1; + if(upos) { + if(msg->rcv.proto != PROTO_UDP) { + LM_ERR("adding received parameter to Contact URI works only for UDP\n"); + return -1; + } + } if(create_rcv_uri(&uri, msg) < 0) { return -1; @@ -2129,16 +2133,20 @@ static int ki_add_rcv_param(sip_msg_t *msg, int upos) return -1; } memcpy(param, RECEIVED, RECEIVED_LEN); - param[RECEIVED_LEN] = '\"'; - memcpy(param + RECEIVED_LEN + 1, uri.s, uri.len); - param[RECEIVED_LEN + 1 + uri.len] = '\"'; - - if(hdr_param) { - /* add the param as header param */ - anchor = anchor_lump(msg, c->name.s + c->len - msg->buf, 0, 0); + if(upos) { + memcpy(param + RECEIVED_LEN, uri.s, uri.len); } else { + param[RECEIVED_LEN] = '\"'; + memcpy(param + RECEIVED_LEN + 1, uri.s, uri.len); + param[RECEIVED_LEN + 1 + uri.len] = '\"'; + } + + if(upos) { /* add the param as uri param */ anchor = anchor_lump(msg, c->uri.s + c->uri.len - msg->buf, 0, 0); + } else { + /* add the param as header param */ + anchor = anchor_lump(msg, c->name.s + c->len - msg->buf, 0, 0); } if(anchor == NULL) { LM_ERR("anchor_lump failed\n"); @@ -2146,9 +2154,8 @@ static int ki_add_rcv_param(sip_msg_t *msg, int upos) return -1; } - if(insert_new_lump_after( - anchor, param, RECEIVED_LEN + 1 + uri.len + 1, 0) - == 0) { + if(insert_new_lump_after(anchor, param, + RECEIVED_LEN + 1 + uri.len + 1 - ((upos)?2:0), 0) == 0) { LM_ERR("insert_new_lump_after failed\n"); pkg_free(param); return -1;

6 years, 7 months

git:master:08df9d1b: nathelper: fixed interpretation of flags param for add_rcv_param()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 08df9d1b11ff3fcfe241ce179560431145be8216 URL: https://github.com/kamailio/kamailio/commit/08df9d1b11ff3fcfe241ce179560431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T11:44:33+01:00 nathelper: fixed interpretation of flags param for add_rcv_param() - add as uri param when the flags are set and different than 0 - small typo in log message --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/08df9d1b11ff3fcfe241ce179560431… Patch: https://github.com/kamailio/kamailio/commit/08df9d1b11ff3fcfe241ce179560431… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 5eb7f6a12f..168bae09cc 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2104,12 +2104,15 @@ static int create_rcv_uri(str *uri, struct sip_msg *m) * Add received parameter to Contacts for further * forwarding of the REGISTER requuest */ -static int ki_add_rcv_param(sip_msg_t *msg, int hdr_param) +static int ki_add_rcv_param(sip_msg_t *msg, int upos) { contact_t *c; struct lump *anchor; char *param; str uri; + int hdr_param; + + hdr_param = (upos)?0:1; if(create_rcv_uri(&uri, msg) < 0) { return -1; @@ -2169,7 +2172,7 @@ static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) if(str1) { if(fixup_get_ivalue(msg, (gparam_t*)str1, &hdr_param)<0) { - LM_ERR("failed to get falgs parameter\n"); + LM_ERR("failed to get flags parameter\n"); return -1; } }

6 years, 7 months

git:master:f540ff43: modules: readme files regenerated - json ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: f540ff43e52696ad3f21edc8188cf2ddc62686bc URL: https://github.com/kamailio/kamailio/commit/f540ff43e52696ad3f21edc8188cf2d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-24T09:46:40+01:00 modules: readme files regenerated - json ... [skip ci] --- Modified: src/modules/json/README --- Diff: https://github.com/kamailio/kamailio/commit/f540ff43e52696ad3f21edc8188cf2d… Patch: https://github.com/kamailio/kamailio/commit/f540ff43e52696ad3f21edc8188cf2d… --- diff --git a/src/modules/json/README b/src/modules/json/README index 2f3e6dc7a0..139597f9cb 100644 --- a/src/modules/json/README +++ b/src/modules/json/README @@ -1,84 +1,2 @@ -JSON Module -Matthew Williams - <matthew(a)flowroute.com> - -Edited by - -Matthew Williams - - <matthew(a)flowroute.com> - - Copyright © 2011 Flowroute LLC (flowroute.com) - __________________________________________________________________ - - Table of Contents - - 1. Admin Guide - - 1. Overview - 2. Dependencies - - 2.1. Kamailio Modules - 2.2. External Libraries or Applications - - 3. Functions - - 3.1. json_get_field(json_string, field_name, destination) - - List of Examples - - 1.1. json_get_field usage - -Chapter 1. Admin Guide - - Table of Contents - - 1. Overview - 2. Dependencies - - 2.1. Kamailio Modules - 2.2. External Libraries or Applications - - 3. Functions - - 3.1. json_get_field(json_string, field_name, destination) - -1. Overview - - This is a simple module allowing to retrieve values from a JSON string. - - For more complex operations with JSON documents, see the JANSSON - module. - -2. Dependencies - - 2.1. Kamailio Modules - 2.2. External Libraries or Applications - -2.1. Kamailio Modules - - The following modules must be loaded before this module: - * None - -2.2. External Libraries or Applications - - The following libraries or applications must be installed before - running Kamailio with this module loaded: - * libjson (https://github.com/json-c/json-c/wiki) - -3. Functions - - 3.1. json_get_field(json_string, field_name, destination) - -3.1. json_get_field(json_string, field_name, destination) - - Copy field 'field_name' from json object 'json_string' and store it in - pvar 'destination'. - - Example 1.1. json_get_field usage -... -json_get_field("{'foo':'bar'}", "foo", "$var(foo)"); -xlog("foo is $var(foo)"); -...

6 years, 7 months

[kamailio/kamailio] topos and dialog timeout conflict (#1216)

by dryvoip

### Description When topos is loaded and dialog is configured to timeout a call by sending BYE to each side, the Route: header is lost and one of the BYEs is not sent to the correct destination. This problem does not exist when topos is not loaded. ### Troubleshooting #### Reproduction ``` modparam("dialog", "rr_param", "dv") modparam("dialog", "profiles_with_value", "inbound_call ; outbound_call; timed_call") modparam("dialog", "dlg_match_mode", 1) modparam("dialog", "dlg_flag", 4) modparam("dialog", "send_bye", 1) modparam("dialog", "timer_procs", 1) modparam("dialog", "timeout_noreset", 1) modparam("dialog", "default_timeout", 43200) $avp(limit) = 15; dlg_manage(); dlg_set_timeout_by_profile("timed_call", "1", "$avp(limit)"); dlg_set_timeout($avp(limit)); set_dlg_profile("timed_call", "1"); ``` #### Log Messages ``` Aug 14 11:06:28 x /usr/sbin/kamailio[11925]: WARNING: dialog [dlg_req_within.c:216]: bye_reply_cb(): inconsitent dlg timer data on dlg 0x7fe5e0b162f8 [438:1408] with clid 'fPBP01fpFOA5Lq6aVwtZ6Q..' and tags '9f514a4f' 'as6e1fd9bc' Aug 14 11:06:28 x /usr/sbin/kamailio[11925]: NOTICE: acc [acc_cdr.c:352]: log_write_cdr(): start_time=1502733971.701; end_time=1502733988.052; duration=16.351 Aug 14 11:06:28 x /usr/sbin/kamailio[11925]: WARNING: acc [acc_cdr.c:219]: db_write_cdr(): fallback to dlg_only search because of message doesn't exist. ``` #### SIP Traffic Good bye (without topos loaded) ``` 2017-08-14 10:06:29 -0800 : 10.10.10.180:5060 -> 10.10.10.177:5065 BYE sip:2505551234@10.20.20.224:5060 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.180;branch=z9hG4bKbe16.c8c401b7000000000000000000000000.0 To: <sip:2505551234@mtl.dryvoip.ca;transport=UDP>;tag=as6e1fd9bc From: <sip:1715033_123@mtl.dryvoip.ca;transport=UDP>;tag=9f514a4f CSeq: 3 BYE Call-ID: fPBP01fpFOA5Lq6aVwtZ6Q.. Route: <sip:10.10.10.177:5065;lr=on> Content-Length: 0 User-Agent: kamailio (5.0.2 (x86_64/linux)) Max-Forwards: 70 ``` Bad bye (with topos loaded) ``` 2017-08-14 09:50:35 -0800 : 10.10.10.180:5060 -> 10.20.20.224:5060 BYE sip:2505551234@10.20.20.224:5060 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.180;branch=z9hG4bK2409.87c78083000000000000000000000000.0 To: <sip:2505551234@mtl.dryvoip.ca;transport=UDP>;tag=as574ee653 From: <sip:1715033_123@mtl.dryvoip.ca;transport=UDP>;tag=df42e302 CSeq: 3 BYE Call-ID: s1A7v71pjL_HNxHBscGpSg.. Content-Length: 0 User-Agent: kamailio (5.0.2 (x86_64/linux)) Max-Forwards: 70 ``` ### Possible Solutions ### Additional Information ``` version: kamailio 5.0.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_LISTEN 16, 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 on 12:04:13 Jun 26 2017 with gcc 4.4.7 ``` -- 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/1216

6 years, 7 months

[kamailio/kamailio] carrierroute: cr.dump_routes prints error or hangs after over 100 prefixes (#1304)

by Rick

### Description Try to fill carrierroute with routing data and test result with `kamcmd`, but the rpc command never gives a result. ### Troubleshooting #### Reproduction ``` /* ----- ctl params -------------------------------------------------------- */ modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") modparam("ctl", "mode", 0660) /* ----- carrierroute params ----------------------------------------------- */ modparam("carrierroute", "config_source", "db") modparam("carrierroute", "db_url", "EXTERN_READ_DBURL") modparam("carrierroute", "fetch_rows", 2000) modparam("carrierroute", "db_load_description", 1) modparam("carrierroute", "match_mode", 10) modparam("carrierroute", "avoid_failed_destinations", 1) ``` Kamailio is running with the following parameters: ``` /usr/local/sbin/kamailio -u kamailio -g kamailio -m 512 -M 20 -n 16 ``` Fill carrierroute table with 110 Routes, do a routes reload and than try to get the routes dumped. `kamcmd cr.reload_routes` and after that issue `kamcmd cr.dump_routes`, which hangs and don't return a result. #### Log Messages ``` nothing regarding carrierroute in the log ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.0-dev8 (x86_64/freebsd) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, 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_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: unknown compiled on 20:35:54 Nov 1 2017 with clang 4.0 ``` * **Operating System**:  ``` FreeBSD 11.1-RELEASE ``` -- 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/1304

6 years, 7 months

[kamailio/kamailio] http_async_client crash in 5.0.5 (does not crash in 5.0.4) (#1400)

by Alexandru Pirvulescu

### Description Kamailio started to crash in 5.0.5 in http_async_client module. Works in 5.0.4 ### Troubleshooting #### Reproduction Use http_async_client. #### Debugging Data Not yet extracted. Need to figure out how to access the core because it is a container. #### Log Messages ``` 4(30) : <core> [core/mem/q_malloc.c:483]: qm_free(): BUG: qm_free: freeing already freed pointer (0x7fccc205d368), called from http_async_client: async_http.c: set_query_params(599), first free http_async_client: async_http.c: set_query_params(599) - aborting 51(77) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 35 0(1) ALERT: <core> [main.c:742]: handle_sigs(): child process 30 exited by a signal 6 0(1) ALERT: <core> [main.c:745]: handle_sigs(): core was generated 0(1) INFO: <core> [main.c:768]: handle_sigs(): terminating due to SIGCHLD ``` #### SIP Traffic ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_LISTEN 16, 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 5.3.1 ``` * **Operating System**: ``` Ubuntu 16.04 (Xenial) ``` -- 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/1400

6 years, 7 months

git:master:9d8e9574: Merge pull request #1404 from kamailio/json-transformation

by GitHub

Module: kamailio Branch: master Commit: 9d8e957419f36b5ca11144b6f52f005a2b04ef43 URL: https://github.com/kamailio/kamailio/commit/9d8e957419f36b5ca11144b6f52f005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-24T09:35:59+01:00 Merge pull request #1404 from kamailio/json-transformation json: add transformation --- Added: src/modules/json/json_trans.c Added: src/modules/json/json_trans.h Modified: src/modules/json/doc/json_admin.xml Modified: src/modules/json/json_funcs.c Modified: src/modules/json/json_funcs.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9d8e957419f36b5ca11144b6f52f005… Patch: https://github.com/kamailio/kamailio/commit/9d8e957419f36b5ca11144b6f52f005…

6 years, 7 months

git:master:12f6992b: json: add transformation

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: 12f6992bfaf833179f826033102054ad984f22e1 URL: https://github.com/kamailio/kamailio/commit/12f6992bfaf833179f826033102054a… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-01-19T14:01:24-07:00 json: add transformation --- Added: src/modules/json/json_trans.c Added: src/modules/json/json_trans.h Modified: src/modules/json/doc/json_admin.xml Modified: src/modules/json/json_funcs.c Modified: src/modules/json/json_funcs.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/12f6992bfaf833179f826033102054a… Patch: https://github.com/kamailio/kamailio/commit/12f6992bfaf833179f826033102054a…

6 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2018