- sr-dev - kamailio.org

[kamailio/kamailio] TOPOH module mask_ip errantly skips decoding encoded fields (#1222)
by Joshua Riffle 30 Aug '17

30 Aug '17

The topoh module uses its `mask_ip` parameter to tag and identify fields that have been encrypted with its header value. As of Kamailio 4.4.6 code has been added to make sure that `mask_ip` is properly used in the request URI, or `Via`, or any other appropriate SIP header variable before it attempts to perform decryption. Here is a code block that was added at line 738 in `modules/topoh/th_msg.c` ``` /* Do nothing if ruri is not encoded */ if ((REQ_LINE(msg).uri.len<th_uri_prefix.len) || (strncasecmp(REQ_LINE(msg).uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) { LM_DBG("ruri [%.*s] is not encoded",REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); return 0; } ``` This effectively skips any Request URIs that don't properly match the expected `th_uri_prefix` which is created using the `mask_ip` value assigned to `topoh`.  So if I set topoh's `mask_ip` and assume I have set a `mask_key`: ``` modparam("topoh", "mask_ip", "192.168.99.184") ``` Then an `ACK` message like this gets detected and decoded as expected: ``` ACK sip:192.168.99.184;line=sr-1IFG6oxISo4wSekmUolOBKVwbolIboxd6JdwS7xiUekISKPm10NH18Rz1uBZtTpG SIP/2.0 ``` However, if one of my incoming carriers decides to be extra special and append port `:5060` to the request URI like this: ``` ACK sip:192.168.99.184:5060;line=sr-1IFG6oxISo4wSekmUolOBKVwbolIboxd6JdwS7xiUekISKPm10NH18Rz1uBZtTpG SIP/2.0 ``` It gets skipped by topoh because it no longer detects this variation of the URI and I get a message like this: ``` Aug 29 21:36:10 ip-172-31-4-69 /usr/sbin/kamailio[4629]: DEBUG: topoh [th_msg.c:742]: th_unmask_ruri(): ruri [sip:192.168.99.184:5060;line=sr-1IFG 6oxISo4wSekmUolOBKVwbolIboxd6JdwS7xiUekISKPm10NH18Rz1uBZtTpG] is not encoded ``` ### Troubleshooting I thought I might be smart and tried to change the `mask_ip` to `192.168.99.184:5060` but this is additionally blocked by the code that validates `Via` headers in `/modules/topoh/th_msg.c` line 393: ``` /* Skip if via is not encoded */ if (via->host.len!=th_ip.len || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0) { LM_DBG("via %d is not encoded",i); continue; } ``` It only compares the `host` part of the VIA with the `mask_ip` parameter which is `192.168.99.184:5060` (including the port) and therefore doesn't match and is skipped in decoding. #### Reproduction 1. Set `topoh` module `mask_ip` to any acceptable IP address 2. Attempt to handle any traffic from a carrier that adds `:5060` automatically to the end of its request URIs 3. The call will go through and then drop ~90 seconds due to incessant attempts of the Kamailio server attempting to reach the bogus `mask_ip` address #### Debugging Data I believe the above information is fairly plain. I have included the pertinent debug logs, but it is fairly well describing why `topoh` is not decoding certain lines that it should be. #### Log Messages Example of a line that should be decoded which is not being decoded because the incoming carrier has added `:5060` to the `mask_ip` used in the Request URI. ``` Aug 29 21:36:10 ip-172-31-4-69 /usr/sbin/kamailio[4629]: DEBUG: topoh [th_msg.c:742]: th_unmask_ruri(): ruri [sip:192.168.99.184:5060;line=sr-1IFG 6oxISo4wSekmUolOBKVwbolIboxd6JdwS7xiUekISKPm10NH18Rz1uBZtTpG] is not encoded ``` #### SIP Traffic ![examplecall](https://user-images.githubusercontent.com/1807347/29846497-f65ed1e2-8ccb-11e7-9a16-b18cfb4365a9.png) Example of a call that repeatedly attempts to access bogus `mask_ip` in its route because it is not detected by topoh for decoding after it is passed through a carrier which adds `:5060` to its Request URIs. ### Possible Solutions No workarounds :( I also don't have the option of asking carriers to change their standing policy of appending the port ":5060" but the validation efforts in the `topoh` module could be expanded to accept an undesignated port number in the URI or `topoh` could include a `mask_port` parameter so that it builds its URI to expect one in the request URI and in `Via` header fields. When I have more time to work on the validation C code I will include some suggestions, but others may have a more informed philosophical approach. ### Additional Information To see all changes to `th_msg.c`: ``` git diff 4.4.5 4.4.6 -- modules/topoh/th_msg.c ``` ``` version: kamailio 4.4.6 (x86_64/linux) becbde 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: becbde compiled on 10:23:24 Jun 16 2017 with gcc 4.4.7 ``` * **Operating System**: ``` CentOS release 6.8 (Final) Linux ip-172-31-4-69.us-west-2.compute.internal 2.6.32-642.3.1.el6.x86_64 #1 SMP Tue Jul 12 18:30:56 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1222

2 5

git:4.4:897942d4: modules: readme files regenerated - topoh ... [skip ci]
by Kamailio Dev 30 Aug '17

30 Aug '17

Module: kamailio Branch: 4.4 Commit: 897942d47e404a17d235c7dcb6237f024b99e3eb URL: https://github.com/kamailio/kamailio/commit/897942d47e404a17d235c7dcb6237f0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-30T13:16:09+02:00 modules: readme files regenerated - topoh ... [skip ci] --- Modified: modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/897942d47e404a17d235c7dcb6237f0… Patch: https://github.com/kamailio/kamailio/commit/897942d47e404a17d235c7dcb6237f0… --- diff --git a/modules/topoh/README b/modules/topoh/README index 213524545c..fb7442cc56 100644 --- a/modules/topoh/README +++ b/modules/topoh/README @@ -34,6 +34,7 @@ Daniel-Constantin Mierla 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) List of Examples @@ -46,6 +47,7 @@ Daniel-Constantin Mierla 1.7. Set vparam_prefix parameter 1.8. Set callid_prefix parameter 1.9. Set sanity_checks parameter + 1.10. Set uri_prefix_checks parameter Chapter 1. Admin Guide @@ -68,6 +70,7 @@ Chapter 1. Admin Guide 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) 1. Overview @@ -113,6 +116,7 @@ Chapter 1. Admin Guide 3.7. vparam_prefix (str) 3.8. callid_prefix (str) 3.9. sanity_checks (integer) + 3.10. uri_prefix_checks (integer) 3.1. mask_key (str) @@ -226,3 +230,22 @@ modparam("topoh", "callid_prefix", "***") ... modparam("topoh", "sanity_checks", 1) ... + +3.10. uri_prefix_checks (integer) + + If set to 1, topoh module will check if URIs to be decoded match the + expected prefix composed from mask IP and parameter name prefix. It can + make the topoh processing safer by avoiding to try decoding URIs which + were not encoded previously by topoh. + + Note: do not enable this option if you have SIP devices that can alter + the URI values it takes from Contact or Record-Route headers (like + adding port 5060 when no port is in received URIs, or thet introduce + new parameters at unknown position). + + Default value is 0. + + Example 1.10. Set uri_prefix_checks parameter +... +modparam("topoh", "uri_prefix_checks", 1) +...

1 0

git:4.4:01da6686: topoh: option to disable uri prefix checks
by Daniel-Constantin Mierla 30 Aug '17

30 Aug '17

Module: kamailio Branch: 4.4 Commit: 01da6686c00aefb930067bfcb8310cf869278527 URL: https://github.com/kamailio/kamailio/commit/01da6686c00aefb930067bfcb8310cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T13:07:27+02:00 topoh: option to disable uri prefix checks - some devices do not copy the exact URI as received in headers (Contact, Record-Route) - they can add default port or mix parameters - reported by GH #1165 (cherry picked from commit de3386e4a303adecc3eee809c05e0654b7a05065) (cherry picked from commit a9d6ffa5f39e048642bf14129b9b484250cce3ae) --- Modified: modules/topoh/th_msg.c Modified: modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/01da6686c00aefb930067bfcb8310cf… Patch: https://github.com/kamailio/kamailio/commit/01da6686c00aefb930067bfcb8310cf… --- diff --git a/modules/topoh/th_msg.c b/modules/topoh/th_msg.c index 1d4287f44a..5519b8daac 100644 --- a/modules/topoh/th_msg.c +++ b/modules/topoh/th_msg.c @@ -57,6 +57,7 @@ extern str th_vparam_prefix; extern int th_param_mask_callid; extern int th_mask_addr_myself; +extern int th_uri_prefix_checks; int th_skip_rw(char *s, int len) { @@ -391,8 +392,8 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) if(i!=1) { /* Skip if via is not encoded */ - if (via->host.len!=th_ip.len - || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0) + if (th_uri_prefix_checks && (via->host.len!=th_ip.len + || strncasecmp(via->host.s, th_ip.s, th_ip.len)!=0)) { LM_DBG("via %d is not encoded",i); continue; @@ -687,10 +688,13 @@ int th_unmask_route(sip_msg_t *msg) if(i!=1) { /* Skip if route is not encoded */ - if ((rr->nameaddr.uri.len<th_uri_prefix.len) || - (strncasecmp(rr->nameaddr.uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + if (th_uri_prefix_checks + && ((rr->nameaddr.uri.len<th_uri_prefix.len) || + (strncasecmp(rr->nameaddr.uri.s,th_uri_prefix.s, + th_uri_prefix.len)!=0))) { - LM_DBG("rr %d is not encoded: [%.*s]",i,rr->nameaddr.uri.len,rr->nameaddr.uri.s); + LM_DBG("rr %d is not encoded: [%.*s]", i, + rr->nameaddr.uri.len, rr->nameaddr.uri.s); rr = rr->next; continue; } @@ -736,8 +740,9 @@ int th_unmask_ruri(sip_msg_t *msg) str out; /* Do nothing if ruri is not encoded */ - if ((REQ_LINE(msg).uri.len<th_uri_prefix.len) || - (strncasecmp(REQ_LINE(msg).uri.s,th_uri_prefix.s,th_uri_prefix.len)!=0)) + if (th_uri_prefix_checks && ((REQ_LINE(msg).uri.len<th_uri_prefix.len) || + (strncasecmp(REQ_LINE(msg).uri.s, th_uri_prefix.s, + th_uri_prefix.len)!=0))) { LM_DBG("ruri [%.*s] is not encoded",REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); return 0; @@ -798,8 +803,8 @@ int th_unmask_refer_to(sip_msg_t *msg) uri = &(get_refer_to(msg)->uri); /* Do nothing if refer_to is not encoded */ - if ((uri->len<th_uri_prefix.len) - || (strncasecmp(uri->s, th_uri_prefix.s, th_uri_prefix.len)!=0)) + if (th_uri_prefix_checks && ((uri->len<th_uri_prefix.len) + || (strncasecmp(uri->s, th_uri_prefix.s, th_uri_prefix.len)!=0))) { LM_DBG("refer-to [%.*s] is not encoded",uri->len,uri->s); return 0; diff --git a/modules/topoh/topoh_mod.c b/modules/topoh/topoh_mod.c index 266cc465a8..9742cef143 100644 --- a/modules/topoh/topoh_mod.c +++ b/modules/topoh/topoh_mod.c @@ -74,11 +74,12 @@ str th_uri_prefix = {0, 0}; int th_param_mask_callid = 0; int th_sanity_checks = 0; -sanity_api_t scb; +int th_uri_prefix_checks = 0; int th_mask_addr_myself = 0; int th_msg_received(void *data); int th_msg_sent(void *data); +sanity_api_t scb; /** module functions */ static int mod_init(void); @@ -93,6 +94,7 @@ static param_export_t params[]={ {"vparam_prefix", PARAM_STR, &th_vparam_prefix}, {"callid_prefix", PARAM_STR, &th_callid_prefix}, {"sanity_checks", PARAM_INT, &th_sanity_checks}, + {"uri_prefix_checks", PARAM_INT, &th_uri_prefix_checks}, {0,0,0} };

1 0

git:4.4:4b2c51a5: topoh: documented uri_prefix_checks parameter
by Daniel-Constantin Mierla 30 Aug '17

30 Aug '17

Module: kamailio Branch: 4.4 Commit: 4b2c51a527cb5e7810694ef64754608e8aca68a3 URL: https://github.com/kamailio/kamailio/commit/4b2c51a527cb5e7810694ef64754608… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T13:07:44+02:00 topoh: documented uri_prefix_checks parameter (cherry picked from commit ca3f2fc6dd2c94410b225d2efb82081b828ddd01) (cherry picked from commit 826b3cab606fb51c7139fe81463aeb2409f40b67) --- Modified: modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b2c51a527cb5e7810694ef64754608… Patch: https://github.com/kamailio/kamailio/commit/4b2c51a527cb5e7810694ef64754608… --- diff --git a/modules/topoh/doc/topoh_admin.xml b/modules/topoh/doc/topoh_admin.xml index fd588cd5f3..f4f5702a06 100644 --- a/modules/topoh/doc/topoh_admin.xml +++ b/modules/topoh/doc/topoh_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -253,7 +253,34 @@ modparam("topoh", "sanity_checks", 1) </programlisting> </example> </section> - + <section> + <title><varname>uri_prefix_checks</varname> (integer)</title> + <para> + If set to 1, topoh module will check if URIs to be decoded match + the expected prefix composed from mask IP and parameter name prefix. + It can make the topoh processing safer by avoiding to try decoding + URIs which were not encoded previously by topoh. + </para> + <para> + Note: do not enable this option if you have SIP devices that can + alter the URI values it takes from Contact or Record-Route headers + (like adding port 5060 when no port is in received URIs, or + thet introduce new parameters at unknown position). + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>uri_prefix_checks</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "uri_prefix_checks", 1) +... +</programlisting> + </example> + </section> </section> </chapter>

1 0

git:5.0:006d7953: kamdbctl: regenerated db creation scripts
by Daniel-Constantin Mierla 30 Aug '17

30 Aug '17

Module: kamailio Branch: 5.0 Commit: 006d79534711ce054ff45abce7978430cfab38a8 URL: https://github.com/kamailio/kamailio/commit/006d79534711ce054ff45abce797843… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T13:00:54+02:00 kamdbctl: regenerated db creation scripts --- Modified: utils/kamctl/db_berkeley/kamailio/rtpengine Modified: utils/kamctl/db_sqlite/rtpengine-create.sql Modified: utils/kamctl/dbtext/kamailio/rtpengine Modified: utils/kamctl/mongodb/kamailio/rtpengine.json Modified: utils/kamctl/mysql/rtpengine-create.sql Modified: utils/kamctl/oracle/rtpengine-create.sql Modified: utils/kamctl/postgres/rtpengine-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/rtpengine-mod Modified: utils/kamctl/xhttp_pi/rtpengine-table --- Diff: https://github.com/kamailio/kamailio/commit/006d79534711ce054ff45abce797843… Patch: https://github.com/kamailio/kamailio/commit/006d79534711ce054ff45abce797843…

1 0

git:5.0:68e1b32c: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 30 Aug '17

30 Aug '17

Module: kamailio Branch: 5.0 Commit: 68e1b32ca79454cb222ceac08b1ff78f9c265fc4 URL: https://github.com/kamailio/kamailio/commit/68e1b32ca79454cb222ceac08b1ff78… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-30T12:46:37+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/cplc/README Modified: src/modules/http_client/README Modified: src/modules/jsonrpcs/README Modified: src/modules/pua_reginfo/README Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/68e1b32ca79454cb222ceac08b1ff78… Patch: https://github.com/kamailio/kamailio/commit/68e1b32ca79454cb222ceac08b1ff78…

1 0

git: new commits in branch 5.0
by Daniel-Constantin Mierla 30 Aug '17

30 Aug '17

- URL: https://github.com/kamailio/kamailio/commit/06a03ab05b6db405505eff0b7b1bb1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-29T23:12:54+02:00 core: do not execute clear_branches() on next faked msg - the function clears the global variables for branches (cherry picked from commit 68db22bdfe50ff34df8e33bc06b80b5ad4844d7b) - URL: https://github.com/kamailio/kamailio/commit/852f2d9138dc94d6c49ddc86d062561… Author: Eloy Coto <eloy.coto(a)gmail.com> Date: 2017-08-29T23:15:35+02:00 evapi: Improved error message Signed-off-by: Eloy Coto <eloy.coto(a)gmail.com> (cherry picked from commit 5f249318adfe26b35426c2b43f4c3df31edc1de1) - URL: https://github.com/kamailio/kamailio/commit/a77351ebf01ab7d84259b729c543a9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-29T23:15:57+02:00 core: faked msg - functions to get next fmsg with clear branches (cherry picked from commit 10129d056e3660a33b6ebc7b487b1de0f616dcc9) - URL: https://github.com/kamailio/kamailio/commit/cebcf91e1941d4d82d1ca503fe9cf4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-29T23:20:05+02:00 htable: map $shtrecord() inner names over integer ids - avoid string comparison at runtime (cherry picked from commit 8ce1bcd52cd5117f920acce5f78683e974d4a3a4) - URL: https://github.com/kamailio/kamailio/commit/00d2cc7695fe97bc82c5d9b7c10b66f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:01:15+02:00 core: updated log macros for parse rpid (cherry picked from commit a526764c65ffea767fecbb13021ba48304524882) - URL: https://github.com/kamailio/kamailio/commit/bfeb32bd00f9eaaafcb6e90388bde7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:04:52+02:00 pv: coherent whitespacing and indentation for pv time code (cherry picked from commit da07cc8c724724d89dfe02bbe8a980f241afc582) - URL: https://github.com/kamailio/kamailio/commit/cec019449abf718f2215cb99616a701… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-08-30T00:05:58+02:00 modules/jsonrpcs: add missing apostrophe to example (cherry picked from commit f0f1a9a8db1f5238b0ace1d3f190d0d9f0b2628d) - URL: https://github.com/kamailio/kamailio/commit/662d1aac66a35c51e23c69fcb88b446… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-08-30T00:06:57+02:00 core/socket_info: use internal str2int() instead of strtol() - strtol() works only for null terminated strings - fix for issue GH #1161 (cherry picked from commit baf2d095b1d4dcc932ece9d48a6a8c397fa7b1a7) - URL: https://github.com/kamailio/kamailio/commit/58656b7f158be13058e72df6779d5d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:07:53+02:00 core: remove inline from implementation of functions declared without it (cherry picked from commit 9c9da87943ad86fd4ca3ba8b007cebfcb7d9bc61) - URL: https://github.com/kamailio/kamailio/commit/69bc83888cc8009d319957d24704bcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:09:01+02:00 rr: small formatting adjustments to doc examples (cherry picked from commit e518e5e7a50be3510c896bd5f8a4cc38146631cc) - URL: https://github.com/kamailio/kamailio/commit/3526f30c0e9a882cfe870295d49cc0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:10:52+02:00 tls: dynamic locks not needed for openssl v1.1.0+ - openssl v1.1.0 is thread safe - fixes the compile warnings for libssl 1.1.0 (cherry picked from commit e7c03ce6ce61119fbf5cb9f41b7abcd4c7138d58) - URL: https://github.com/kamailio/kamailio/commit/5f5c149395c78124f7a84875789d479… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:11:22+02:00 tls: updated tls version selection for libssl 1.1.0 api - fixes compile warnings for deprecated TLSXY_method() functions (cherry picked from commit 76efc9b7a1489007f9ff431e730ce4e86b446a6c) - URL: https://github.com/kamailio/kamailio/commit/1775e88e34acaa30dd0138d241eea06… Author: Ilya Shipitsin <chipitsine(a)gmail.com> Date: 2017-08-30T00:11:43+02:00 utils/db_berkeley: access variable after null pointer check (cherry picked from commit bbe0370939ff8a14e931595389b6678817ff1056) - URL: https://github.com/kamailio/kamailio/commit/55ed4b37da77e0d928078e6b9842325… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:12:55+02:00 core: dns cache - catch unknown record type to avoid compile warnings (cherry picked from commit f461081a400b398a8c47b1cb338ffc4bf8bd2ede) - URL: https://github.com/kamailio/kamailio/commit/4043bbc434ab7f80580c3f71b861bb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:13:21+02:00 core: parse fline - cast number to char for print to avoid compile warning (cherry picked from commit ccb368e6420c1e4849867bcdbd136d0e9a8db67d) - URL: https://github.com/kamailio/kamailio/commit/ebe9387547a65f34b81b0184df4f284… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2017-08-30T00:13:49+02:00 db_mysql Look for MariaDB as well as MySQL (cherry picked from commit 4f587124998e665c5ab9df7fe14cfbb3a39a9ec8) - URL: https://github.com/kamailio/kamailio/commit/efee46251f7da2007a4e6e563a6d4e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:15:29+02:00 websocket: use sizeof over the type of the pointer to be allocated (cherry picked from commit 145d10f5a2dcad3cbdb477aaabdc853bb606b355) - URL: https://github.com/kamailio/kamailio/commit/db0e94f53acb6ab86eb8730043effcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:16:22+02:00 http_client: move to next field before freeing item in fixup function (cherry picked from commit fce9044ece62d6b5e81330de62fa1fa402145e68) - URL: https://github.com/kamailio/kamailio/commit/f6ac44c5528c4a20e75a4e4b77d27f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:16:43+02:00 http_client: allow providing headers to http_client_query() - lost from removed http_query() in utils (cherry picked from commit 9c1d4cec94b47cd0b2e69e646f2fd14b84e3cf03) - URL: https://github.com/kamailio/kamailio/commit/964ca6b32581f6af1ce1b97646d5796… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:17:04+02:00 http_client: updated docs for http_client_query() (cherry picked from commit 279e622b53b636d49b207907c8f3fe60ff9e2cd3) - URL: https://github.com/kamailio/kamailio/commit/29d871493601cb80c77f870aff94a7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:21:31+02:00 Makefile.defs: compile with system malloc for pkg if MEMPKG=sys - if MEMDBGSYS=1, the use a debug variant for system malloc (cherry picked from commit cee1de72a2b28d002bc84dd205b7ecf9f285fdd4) - URL: https://github.com/kamailio/kamailio/commit/cd59fcf3fef3a1446a49d60ad636ff2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:22:26+02:00 core: mem - updated defines for sys malloc and mem error log messages (cherry picked from commit 1cc3f0ddfc517ed2b1f7820f9feedee8a91d0ac7) - URL: https://github.com/kamailio/kamailio/commit/1c82b218273bacaf1a6cfa93fdc2c8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:23:55+02:00 http_client: move assign for download size after right side variable was set (cherry picked from commit 632380ff13dce5d5f1d1553797b7783fdc986c59) - URL: https://github.com/kamailio/kamailio/commit/f351ea29f2d561fbd4d362a795cf535… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:24:23+02:00 siptrace: proper varible in log message when af is unknown (cherry picked from commit b1a6830c414ddcfb21fc07bc4995b756d617558e) - URL: https://github.com/kamailio/kamailio/commit/e92b6ecc52cc6a64856c929043504c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T00:25:10+02:00 core: dns cachec- safety check in log message before abort (cherry picked from commit ff2e0d96a50eadf4e872865d43f0fbe15aef18bd) - URL: https://github.com/kamailio/kamailio/commit/3ba4cc6c039056c8cebd21911709ffa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:45:43+02:00 rr: use macro to get parsed From in record_route_preset() - safety check for parsed pointer (cherry picked from commit 8b0a42ab64c02a1fa253ce156442bab64a4fe3db) - URL: https://github.com/kamailio/kamailio/commit/09488d07231bd59f4466a681f2f792e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:46:54+02:00 seas: avoid double free and leak (cherry picked from commit 366104d2f79ccfa65850cd2e3bfb5ed8be467bc2) - URL: https://github.com/kamailio/kamailio/commit/571bba63f2cfbcbcd601d41a6d930d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:47:50+02:00 enum: fixed code for country code length (cherry picked from commit b95e536335083ee6f1f67e2007463ac7e8403ec8) - URL: https://github.com/kamailio/kamailio/commit/e070571cf59a43b615690a3ec2fd919… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:48:18+02:00 core: avoid accessing freed structure in case of duplicated listen addresses (cherry picked from commit dbd52dacae17eca5a48359c605a2d93607b7c041) - URL: https://github.com/kamailio/kamailio/commit/2ff8e36250864e6a391bd9d0ebb28a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:49:05+02:00 core: parse rr - reset head in case of parse error - avoid acessing an invalid pointer - proper support if trying to parse into an existing rr list in a second attempt (not the case so far) (cherry picked from commit 8eb84f76a6d52598bb2fd5d13b96fba4c6326b7f) - URL: https://github.com/kamailio/kamailio/commit/5b727e0f2ee8d4abc6ba4694d545221… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:49:32+02:00 cfgutils: more log messages for locking functions - it was silent if locks set was not initialized properly which could mislead at runtime, but not showing any error message - if locks set size is too big, set it to 14 (this is used as power of 2) (cherry picked from commit 3ce65db8747ad7b382824f389c2b782a76dbb7a1) - URL: https://github.com/kamailio/kamailio/commit/1001a8333f8475f203d5a3951398297… Author: Vasiliy Ganchev <vance(a)ukr.net> Date: 2017-08-30T11:50:04+02:00 pua_reginfo: use outbound proxy for PUBLISH requests (cherry picked from commit 385995c27084bdca9ebc4a472f9ab41311416f35) - URL: https://github.com/kamailio/kamailio/commit/2590955b6176acef2633b65dbcc5946… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:50:58+02:00 core: cfg.y - fixed condition on case parsing (cherry picked from commit 52f728f73914ab960389ff8afbf1a223f91f07e2) - URL: https://github.com/kamailio/kamailio/commit/302cc81697d7b7a7b187cfb8c87a486… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:52:04+02:00 core: mem/qm - fixed pointer expressions in qm_check() debug function (cherry picked from commit 126e76dc035bd1320cb103c39ad52849844e7448) - URL: https://github.com/kamailio/kamailio/commit/0b940b8f3f5270336a17c8651477749… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:52:23+02:00 core: parser uri - add missing break to avoid useless assignments (cherry picked from commit 1a5662b212ddcbea40ca33e34bfda0459802b756) - URL: https://github.com/kamailio/kamailio/commit/a309561c6cc81187939234a524e5a9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:52:46+02:00 core: proxy - free in case of errors making proxy only from ip (cherry picked from commit 0aa7571afe5c25bfffaf865595181470ac78f4d2) - URL: https://github.com/kamailio/kamailio/commit/3f076581e3b9ffc46aa82cfcfba3c0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:53:16+02:00 core: free locl link structures not linked to listen sockets (cherry picked from commit 98a6ef19bcfe14b7150183a9bec98854f5c0063b) - URL: https://github.com/kamailio/kamailio/commit/eb71b7958cd8217bdc4099462fa3ae6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:53:34+02:00 core: msg translator - reworked error handling to free allocated buffers (cherry picked from commit 6118d832d3ba0efb96820915520af3c8a9bf29de) - URL: https://github.com/kamailio/kamailio/commit/01a93753d6240515872a9efc58c7eb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:53:50+02:00 tmx: missing break in t_cancel_branches(others) (cherry picked from commit 2ab0adee57aa82487adf7d3776835eca071afa27) - URL: https://github.com/kamailio/kamailio/commit/301ee8bb20e5853783496f1080b9fc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:54:07+02:00 dialog: safety checks and free of profiles in case of errors - free partial list of profiles in dlg_set_timeout_by_profile() when no more memory (cherry picked from commit 609297d62a08d1d75550c2f5e7f7fd19b98fd104) - URL: https://github.com/kamailio/kamailio/commit/2232c34ed2a0c5953161e7b17e0ca40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:54:31+02:00 dispatcher: log messages for hashing auth username (cherry picked from commit e9cfb2bf5012cdbde36559f615b58e3a556bfc2d) - URL: https://github.com/kamailio/kamailio/commit/954fd81f7b0431f16b6a3112f7a421f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:54:57+02:00 mtree: access values before safety checks of variables (cherry picked from commit 56d1d317e4bac7130586541fed75be670ea0f9ce) - URL: https://github.com/kamailio/kamailio/commit/15de3bb82f609a1c055194eb9e505ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:55:13+02:00 xcap_server: reset server_name variable after free - avoid re-use in the loop (cherry picked from commit 22aa9043f179f4de8e90fc5946a7afb28060b6f6) - URL: https://github.com/kamailio/kamailio/commit/cd43bb023447ec47d9f83923995c1ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:55:28+02:00 avp: return in case of error in avp select (cherry picked from commit 9a6182fa8b535bc19c43e905d6b6a110b0e830d2) - URL: https://github.com/kamailio/kamailio/commit/c1e0910498dea28c6405ec0683e42d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:55:44+02:00 presence: reset vars to avoid double free in case of error (cherry picked from commit 97ac3b910dc955058fa4c08ad22ac01a4f31fe74) - URL: https://github.com/kamailio/kamailio/commit/127cafe9eafdf8c3d8ed5926884cba5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:55:58+02:00 rls: reset vars to avoid double free in case of error (cherry picked from commit ceaafc67dae4f7e7424c8706ccea90c30eed45b6) - URL: https://github.com/kamailio/kamailio/commit/03e5f8af4bfcc5ea34cf678ac2d9b77… Author: Stefan Mititelu <stefan.mititelu(a)onem.com> Date: 2017-08-30T11:56:18+02:00 dispatcher: Increase line buffer size (cherry picked from commit 1391db0f349956795b8cf6936657fb974ec9b65f) - URL: https://github.com/kamailio/kamailio/commit/23162ffd62cffe78107625349a7dbde… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:56:35+02:00 rls: added missing license headers, coherent indentation (cherry picked from commit 61d3d4ad675032b7a1fc059acef68e81c40b4eba) - URL: https://github.com/kamailio/kamailio/commit/e87051951dcf5a4ea22714c0a1f5c95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:56:53+02:00 msrp: safety checks to avoid analyzer reports (cherry picked from commit 74653204f45195944acc42979d0939cef9513cd4) - URL: https://github.com/kamailio/kamailio/commit/3850fe062d5ecbe4f7e9a9ae59192f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:57:08+02:00 textopsx: free in case of error inside sel_hf_value_name() (cherry picked from commit 7987122d25003dd4b5f0ce47caf3e5c9811917b3) - URL: https://github.com/kamailio/kamailio/commit/39956a5595110ac04e01ebd38c4f852… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:57:54+02:00 jsonrpcs: safety vars init and release checks (cherry picked from commit 080bffeb53181131f8fb8fab0ddcb771bbdd37dc) - URL: https://github.com/kamailio/kamailio/commit/8872413b981fb12c037ed08b39fbea7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:58:13+02:00 pv: free var in case pkg alloc failure (cherry picked from commit 86e349463c7d573e9a5e68bd3984ecc95808adb4) - URL: https://github.com/kamailio/kamailio/commit/54c83a86590e66d47470fd1690a03f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:59:04+02:00 dispatcher: try to add sip: scheme to dst uri, if initial parse fails - operation done when records are loaded from database or file (cherry picked from commit 4220c41f9a443d275cf94e1db3a33fbd3ca14d1b) - URL: https://github.com/kamailio/kamailio/commit/5e36ab3a0028fa9f7c5857c866b0b43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T11:59:44+02:00 lib: dtrie - removed duplicate check for same value (cherry picked from commit 5530fe31fe89a4dfe9e17cbe56c0cd83cb8f45ab) - URL: https://github.com/kamailio/kamailio/commit/58592f0069ccf35ae1a9cbd4c4500c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:00:00+02:00 auth_db: small reorder to do the check before accessing the fields (cherry picked from commit 070057a5d66e2f5dd4bcf90d96f8f8ceeca3a433) - URL: https://github.com/kamailio/kamailio/commit/c5800bc37a629871476ed0a607a055f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:00:19+02:00 registrar: free var in case of pv name error (cherry picked from commit b28e2943b8d171628f81057a352507b2a56b91a4) - URL: https://github.com/kamailio/kamailio/commit/697d19eb23bf01c9c7aa83e8f563828… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:00:35+02:00 usrloc: rpc flush to return error in case of failure (cherry picked from commit 3cbae6841c80de89fc7c72b73c1695e3788c1819) - URL: https://github.com/kamailio/kamailio/commit/9e124c03cfcc33ca3f9090fb097353a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:00:46+02:00 async: free var in case of fixup error (cherry picked from commit bf9d697c31ad2c7614aa37997c4772df8e8d25a7) - URL: https://github.com/kamailio/kamailio/commit/046f0123879be21cd78430c6a46e977… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:00:58+02:00 evapi: handle return code for fcntl (cherry picked from commit c0125e049f1c34afe7411f763f9f57c7a00109a8) - URL: https://github.com/kamailio/kamailio/commit/273f233c18a56c87e566c9ee452c5ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:01:17+02:00 evapi: close server socket if fnctl() fails (cherry picked from commit 23ee80c8d71b9bac63ebe6117620cffc8900c2a9) - URL: https://github.com/kamailio/kamailio/commit/b3f228d143a0af32a58d73fc49f3664… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:02:00+02:00 xlog: free vars in case of errors in fixup functions (cherry picked from commit cd17ca9113031b979fe403255388105ecee0fe73) - URL: https://github.com/kamailio/kamailio/commit/93283a687dc77dfdae3f010035427c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:02:32+02:00 lib/srdb1: added autoincrement id column for rtpengine (cherry picked from commit 9c74b35b06465c9dde23971e342846491fa41c2c) - URL: https://github.com/kamailio/kamailio/commit/adfc7f6033872d1a81b473df562981e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:02:51+02:00 lib/srdb1: make (setid,url) unique key instead of primary - conflicts with autoincrement in mysql (cherry picked from commit b8e9d2697a13c2cdb367aabf4966d6fa09a1319f) - URL: https://github.com/kamailio/kamailio/commit/4ce12109008528bcf03dba0901bf650… Author: Oriol Capsada <ocapsada(a)gmail.com> Date: 2017-08-30T12:04:06+02:00 cplc: use route names to set proxy_route modparam - Changed proxy_route modparam type to string. The route to be executed needs to be defined by name as the current id definition led to some unpredictable behavior. (cherry picked from commit 027871f7a91cf288d36029a4f339801e8b620d10) - URL: https://github.com/kamailio/kamailio/commit/40586c41d1f9f00210318de2a9862ad… Author: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-08-30T12:04:29+02:00 core: set RET_ARRAY flag for core.sockets_list command (cherry picked from commit 38f514064a326f759e0e88adeffd03b32b35d6c0) - URL: https://github.com/kamailio/kamailio/commit/d620b8e94832e2394fb1c48a7f062c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:05:48+02:00 db_postgres: added missing break for INT8OID results - instead of DB1_BIGINT, the result type ended to be DB1_DOUBLE (cherry picked from commit d12f96af28e170c3197a47af5840e5e30639adf6) - URL: https://github.com/kamailio/kamailio/commit/b14d34d734fb5065350d35318e34bb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:06:27+02:00 lib/srdb1: db_table_version() can handle DB1_BIGINT and DB1_DOUBLE values - in case of views or other database engine, the type for version value can be different that DB1_INT. If it is a number, cast it to int - extracted from GH #1186 by Emmanuel Schmidbauer <emmanuel(a)getweave.com> (cherry picked from commit d0ac74742f6aeb71492d2a9cab747162cdc5ddf8) - URL: https://github.com/kamailio/kamailio/commit/d40268a04de501dadc0f8629e521f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:17:14+02:00 pdb: avoid unaligned pointer address (cherry picked from commit 7c795adaf0f3899567a9769fecbbb300387837be) - URL: https://github.com/kamailio/kamailio/commit/d8f0d9e776000415720051fd6e55ed1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:32:49+02:00 app_lua: safer alloc size for hdr operations (cherry picked from commit 15de1f06b94588ed0764ab3a3b0cd1202b5c1cb6) - URL: https://github.com/kamailio/kamailio/commit/31d1fba458f941fb5b580d0220118ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-30T12:33:15+02:00 app_python: several free of allocated vars in case of errors (cherry picked from commit 8353b0341ada19d6f0611e0aa693bfa20db0b51c)

1 0

git:master:8d9459b7: tls: fix sanitization of log macros commit a8b30d340f9d
by Victor Seva 29 Aug '17

29 Aug '17

Module: kamailio Branch: master Commit: 8d9459b7de28de90993e7e26c827298c7b2d08a4 URL: https://github.com/kamailio/kamailio/commit/8d9459b7de28de90993e7e26c827298… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-08-29T12:58:41+02:00 tls: fix sanitization of log macros commit a8b30d340f9d --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/8d9459b7de28de90993e7e26c827298… Patch: https://github.com/kamailio/kamailio/commit/8d9459b7de28de90993e7e26c827298… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 65704ff27e..936bec1f81 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -763,7 +763,6 @@ int init_tls_h(void) }else low_mem_threshold2*=1024; /* KB */ if ((low_mem_threshold1==0) || (low_mem_threshold2==0)) - :w LM_WARN("tls: openssl bug #1491 (crash/mem leaks on low memory)" " workarround disabled\n"); else

1 0

Broken: kamailio/kamailio#4766 (master - a8b30d3)
by Travis CI 29 Aug '17

29 Aug '17

Build Update for kamailio/kamailio ------------------------------------- Build: #4766 Status: Broken Duration: 5 minutes and 38 seconds Commit: a8b30d3 (master) Author: Daniel-Constantin Mierla Message: tls: sanitization of log macros View the changeset: https://github.com/kamailio/kamailio/compare/fcc4b8ed5377...a8b30d340f9d View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/269519919?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:a8b30d34: tls: sanitization of log macros
by Daniel-Constantin Mierla 29 Aug '17

29 Aug '17

Module: kamailio Branch: master Commit: a8b30d340f9d19daac10ed987707adf7327ef420 URL: https://github.com/kamailio/kamailio/commit/a8b30d340f9d19daac10ed987707adf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-29T12:03:50+02:00 tls: sanitization of log macros --- Modified: src/modules/tls/fixed_c_zlib.h Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_mod.c Modified: src/modules/tls/tls_verify.c --- Diff: https://github.com/kamailio/kamailio/commit/a8b30d340f9d19daac10ed987707adf… Patch: https://github.com/kamailio/kamailio/commit/a8b30d340f9d19daac10ed987707adf…

1 0

[kamailio/kamailio] Document record-call option in rtpengine (#1221)
by aalba6675 29 Aug '17

29 Aug '17

### Description Document record-call option in rtpengine module  ### Troubleshooting rtpengine module has an undocumented option in rtpengine_manage and rtpengine_offer ``` rtpengine_manage("record-call=on") ``` The use case is to start the recording immediately so the recording structures are initialized in rtpengine. If we do not do this but use a sequence like ``` rtpengine_manage() /* A */ /* what happens is recording structures are no initialized so metadata for caller's SDP is not written ou */ start_recording() /* B */ ``` The metadata of the recording will omit the caller's SDP because this is written out during A but recording structures are only initialized in B. https://github.com/sipwise/rtpengine/issues/385 -- 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/1221

2 4

Accounting server with IMS Kamailio Solution
by Prasannakumar Merugu 28 Aug '17

28 Aug '17

Hi, We are developing proprietary kamailio-ims solution as shown in below configuration for our immediate requirement. Is this configuration with Accounting server between UA and P-Server workable? Later on we want to add standard solution. Thanks, Prasannakumar Merugu. 9010028290

1 1

git:master:fcc4b8ed: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 28 Aug '17

28 Aug '17

Module: kamailio Branch: master Commit: fcc4b8ed537714c2ab5bbb7de221e0218e913d24 URL: https://github.com/kamailio/kamailio/commit/fcc4b8ed537714c2ab5bbb7de221e02… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-28T12:31:32+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/fcc4b8ed537714c2ab5bbb7de221e02… Patch: https://github.com/kamailio/kamailio/commit/fcc4b8ed537714c2ab5bbb7de221e02… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 7d88a8be81..fd8a840716 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -1959,6 +1959,11 @@ rtpengine_offer(); the Sipwise rtpengine proxy. This is especially useful when the first call leg is handled by some rtpengine machine while the second call leg is handled by other rtpengine machine. + + record-call=on - instructs RTPEngine to record the session. + Use it in rtpengine_offer() to start recording immediately and + save the call metadata, as alternative to start_recording(). + Check also the documentation of RTPEngine, these flags are + documented there as well: https://github.com/sipwise/rtpengine. This function can be used from ANY_ROUTE. @@ -2077,8 +2082,10 @@ rtpengine_manage(); 5.7. start_recording() - This function will send a signal to the RTP proxy to record the RTP - stream on the RTP proxy. + This function will send a signal to the RTP relay to record the RTP + stream flowing through it. See also the option “record-call=on” for + rtpengine_manage()/rtpengine_offer(), which offers an alternative for + call recording, saving also call metadata from SDP. This function can be used from REQUEST_ROUTE and ONREPLY_ROUTE.

1 0

git:master:5272f4e4: rtpengine: documented the flag for call recording
by Daniel-Constantin Mierla 28 Aug '17

28 Aug '17

Module: kamailio Branch: master Commit: 5272f4e4e302e44ad870bd8b8936c2517848c0ca URL: https://github.com/kamailio/kamailio/commit/5272f4e4e302e44ad870bd8b8936c25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-28T12:25:09+02:00 rtpengine: documented the flag for call recording - reported by GH #1221 --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5272f4e4e302e44ad870bd8b8936c25… Patch: https://github.com/kamailio/kamailio/commit/5272f4e4e302e44ad870bd8b8936c25… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 4a7272629a..15355bb8c0 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2036,7 +2036,7 @@ rtpengine_offer(); <listitem><para> <emphasis>no-redis-update</emphasis> - this flag can be used by Kamailio in order to tell rtpengine not to persist the call into Redis upon receiving offer/answer() - control commands. If flag is not set, default action is rtpengine persists call + control commands. If flag is not set, default action is rtpengine persists call to redis. </para></listitem> <listitem><para> @@ -2273,7 +2273,16 @@ rtpengine_offer(); in the Sipwise rtpengine proxy. This is especially useful when the first call leg is handled by some rtpengine machine while the second call leg is handled by other rtpengine machine. </para></listitem> + <listitem><para> + <emphasis>record-call=on</emphasis> - instructs RTPEngine to record the session. Use + it in rtpengine_offer() to start recording immediately and save the call metadata, + as alternative to start_recording(). + </para></listitem> </itemizedlist> + <para> + Check also the documentation of RTPEngine, these flags are documented there as well: + <ulink url="https://github.com/sipwise/rtpengine">https://github.com/sipwise/rtpengine</ulink>. + </para> </listitem> </itemizedlist> <para> @@ -2466,8 +2475,11 @@ rtpengine_manage(); <function moreinfo="none">start_recording()</function> </title> <para> - This function will send a signal to the &rtp; proxy to record - the &rtp; stream on the &rtp; proxy. + This function will send a signal to the &rtp; relay to record + the &rtp; stream flowing through it. See also the option + <quote>record-call=on</quote> for rtpengine_manage()/rtpengine_offer(), + which offers an alternative for call recording, saving also call + metadata from SDP. </para> <para> This function can be used from REQUEST_ROUTE and ONREPLY_ROUTE.

1 0

git:master:2d79d1fc: auth: removed module and function names from logs
by Daniel-Constantin Mierla 28 Aug '17

28 Aug '17

Module: kamailio Branch: master Commit: 2d79d1fc20ee1cd056b1b4b453c557671ae99f08 URL: https://github.com/kamailio/kamailio/commit/2d79d1fc20ee1cd056b1b4b453c5576… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-27T11:11:17+02:00 auth: removed module and function names from logs --- Modified: src/modules/auth/api.c --- Diff: https://github.com/kamailio/kamailio/commit/2d79d1fc20ee1cd056b1b4b453c5576… Patch: https://github.com/kamailio/kamailio/commit/2d79d1fc20ee1cd056b1b4b453c5576…

1 0

git:master:08496ed4: core: cfg vars - updated log macros
by Daniel-Constantin Mierla 26 Aug '17

26 Aug '17

Module: kamailio Branch: master Commit: 08496ed43a4c99a082192a2d9d22eacfbb242a16 URL: https://github.com/kamailio/kamailio/commit/08496ed43a4c99a082192a2d9d22eac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-26T16:29:53+02:00 core: cfg vars - updated log macros --- Modified: src/core/cfg/cfg_ctx.c Modified: src/core/cfg/cfg_select.c --- Diff: https://github.com/kamailio/kamailio/commit/08496ed43a4c99a082192a2d9d22eac… Patch: https://github.com/kamailio/kamailio/commit/08496ed43a4c99a082192a2d9d22eac…

1 0

git:master:c2657fd4: core: cfg struct - updated log macros, coherent indentation
by Daniel-Constantin Mierla 25 Aug '17

25 Aug '17

Module: kamailio Branch: master Commit: c2657fd4a4e88e6f86ff9eef3b9fa2dd641c240c URL: https://github.com/kamailio/kamailio/commit/c2657fd4a4e88e6f86ff9eef3b9fa2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-25T12:11:46+02:00 core: cfg struct - updated log macros, coherent indentation --- Modified: src/core/cfg/cfg_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/c2657fd4a4e88e6f86ff9eef3b9fa2d… Patch: https://github.com/kamailio/kamailio/commit/c2657fd4a4e88e6f86ff9eef3b9fa2d…

1 0

git:5.0:ba6ec1a9: modules/lcr: fixed testing if dont_strip_or_prefix_flag is set
by Juha Heinanen 25 Aug '17

25 Aug '17

Module: kamailio Branch: 5.0 Commit: ba6ec1a9c651e43d4a0e89724ad5a7dfa6dafda7 URL: https://github.com/kamailio/kamailio/commit/ba6ec1a9c651e43d4a0e89724ad5a7d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-08-25T10:32:26+03:00 modules/lcr: fixed testing if dont_strip_or_prefix_flag is set (cherry picked from commit b325a7711ac405e5598f7fbd224fb1b8e84221cf) --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ba6ec1a9c651e43d4a0e89724ad5a7d… Patch: https://github.com/kamailio/kamailio/commit/ba6ec1a9c651e43d4a0e89724ad5a7d… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index bb815f9b39..6fb0f1d26d 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2149,7 +2149,7 @@ static int generate_uris(struct sip_msg* _m, char *r_uri, str *r_uri_user, } if ((dont_strip_or_prefix_flag_param != -1) && - isflagset(_m, dont_strip_or_prefix_flag_param)) { + (isflagset(_m, dont_strip_or_prefix_flag_param) == 1)) { strip = 0; prefix.len = 0; }

1 0

git:master:b325a771: modules/lcr: fixed testing if dont_strip_or_prefix_flag is set
by Juha Heinanen 25 Aug '17

25 Aug '17

Module: kamailio Branch: master Commit: b325a7711ac405e5598f7fbd224fb1b8e84221cf URL: https://github.com/kamailio/kamailio/commit/b325a7711ac405e5598f7fbd224fb1b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-08-25T10:29:44+03:00 modules/lcr: fixed testing if dont_strip_or_prefix_flag is set --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b325a7711ac405e5598f7fbd224fb1b… Patch: https://github.com/kamailio/kamailio/commit/b325a7711ac405e5598f7fbd224fb1b… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 02bad0bb5e..5b4c99d865 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2376,7 +2376,7 @@ static int generate_uris(struct sip_msg* _m, char *r_uri, str *r_uri_user, } if ((dont_strip_or_prefix_flag_param != -1) && - isflagset(_m, dont_strip_or_prefix_flag_param)) { + (isflagset(_m, dont_strip_or_prefix_flag_param) == 1)) { strip = 0; prefix.len = 0; }

1 0

[kamailio/kamailio] http_async_client: segfault at 0 (#1219)
by Eugen Biegler 24 Aug '17

24 Aug '17

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data ``` gdb kamailio core.kamailio.114.1503484559.29804 GNU gdb (Debian 7.7.1+dfsg-5) 7.7.1 Copyright (C) 2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from kamailio...(no debugging symbols found)...done. [New LWP 29804] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f4b0a1c23e9 in notification_socket_cb () from /usr/lib/x86_64-linux-gnu/kamailio/modules/http_async_client.so (gdb) bt full #0 0x00007f4b0a1c23e9 in notification_socket_cb () from /usr/lib/x86_64-linux-gnu/kamailio/modules/http_async_client.so No symbol table info available. #1 0x00007f4b09cf23dc in event_base_loop () from /usr/lib/x86_64-linux-gnu/libevent-2.0.so.5 No symbol table info available. #2 0x00007f4b0a1bec74 in async_http_run_worker () from /usr/lib/x86_64-linux-gnu/kamailio/modules/http_async_client.so No symbol table info available. #3 0x00007f4b0a1a886e in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/http_async_client.so No symbol table info available. #4 0x000000000053e25a in ?? () No symbol table info available. #5 0x000000000053df78 in ?? () No symbol table info available. #6 0x000000000053e588 in init_child () No symbol table info available. #7 0x0000000000423913 in main_loop () No symbol table info available. #8 0x000000000042a308 in main () No symbol table info available. (gdb) ``` #### Log Messages ``` kernel:[698859.513811] kamailio[29804]: segfault at 0 ip 00007f4b0a1c23e9 sp 00007ffeb48bdc00 error 4 in http_async_client.so[7f4b0a19e000+38000] /usr/sbin/kamailio[29777]: ALERT: <core> [main.c:743]: handle_sigs(): child process 29804 exited by a signal 11 /usr/sbin/kamailio[29777]: ALERT: <core> [main.c:746]: handle_sigs(): core was generated systemd[1]: kamailio.service: main process exited, code=exited, status=1/FAILURE systemd[1]: Unit kamailio.service entered failed state. ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.0.2 (x86_64/linux) ``` * **Operating System**: ``` Linux 3.16.0-4-amd64 #1 SMP Debian 3.16.43-2+deb8u2 ``` -- 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/1219

2 4

git:master:38f10f86: core: forward - coherent whitespacing and log macro update
by Daniel-Constantin Mierla 24 Aug '17

24 Aug '17

Module: kamailio Branch: master Commit: 38f10f867d8f234d7193eb47b9e176e50d5b021e URL: https://github.com/kamailio/kamailio/commit/38f10f867d8f234d7193eb47b9e176e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-24T12:20:29+02:00 core: forward - coherent whitespacing and log macro update --- Modified: src/core/forward.c --- Diff: https://github.com/kamailio/kamailio/commit/38f10f867d8f234d7193eb47b9e176e… Patch: https://github.com/kamailio/kamailio/commit/38f10f867d8f234d7193eb47b9e176e…

1 0

git:master:ec6850c1: core: cfg group vars - updated log macros
by Daniel-Constantin Mierla 23 Aug '17

23 Aug '17

Module: kamailio Branch: master Commit: ec6850c167a196c3f28d218b3ad1c31f7926b4fa URL: https://github.com/kamailio/kamailio/commit/ec6850c167a196c3f28d218b3ad1c31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-23T11:18:54+02:00 core: cfg group vars - updated log macros --- Modified: src/core/cfg/cfg.c Modified: src/core/cfg/cfg_script.c --- Diff: https://github.com/kamailio/kamailio/commit/ec6850c167a196c3f28d218b3ad1c31… Patch: https://github.com/kamailio/kamailio/commit/ec6850c167a196c3f28d218b3ad1c31…

1 0

rtpproxy: One direction rtp not being relayed
by Jon Bonilla (Manwe) 22 Aug '17

22 Aug '17

Hi all After a migration, a customer is reporting one way audio on incoming calls. A tcpdump capture shows 65 rtp packets in both directions but rtpproxy log shows RTP stats: 1 in from callee, 64 in from caller, 65 relayed, 0 dropped Any thoughts? cheers, Jon

1 1

git:master:6a69220e: modules: readme files regenerated - statsc ... [skip ci]
by Kamailio Dev 22 Aug '17

22 Aug '17

Module: kamailio Branch: master Commit: 6a69220ec8f46528d1c02295452e59462d02d0f5 URL: https://github.com/kamailio/kamailio/commit/6a69220ec8f46528d1c02295452e594… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-22T12:31:44+02:00 modules: readme files regenerated - statsc ... [skip ci] --- Modified: src/modules/statsc/README Modified: src/modules/statsd/README Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/6a69220ec8f46528d1c02295452e594… Patch: https://github.com/kamailio/kamailio/commit/6a69220ec8f46528d1c02295452e594… --- diff --git a/src/modules/statsc/README b/src/modules/statsc/README index a546b56db5..a753399731 100644 --- a/src/modules/statsc/README +++ b/src/modules/statsc/README @@ -31,7 +31,7 @@ Daniel-Constantin Mierla 4. RPC Commands - 4.1. statsc.exec + 4.1. statsc.report List of Examples @@ -57,7 +57,7 @@ Chapter 1. Admin Guide 4. RPC Commands - 4.1. statsc.exec + 4.1. statsc.report 1. Overview @@ -135,9 +135,9 @@ modparam("statsc", "track", "req.received=rcv_requests;rpl.received=rcv_replies" 4. RPC Commands - 4.1. statsc.exec + 4.1. statsc.report -4.1. statsc.exec +4.1. statsc.report Get the report of recorded statistics. diff --git a/src/modules/statsd/README b/src/modules/statsd/README index 58b3fd8ae1..5a414b7744 100644 --- a/src/modules/statsd/README +++ b/src/modules/statsd/README @@ -129,11 +129,10 @@ failure_route[tryagain] { 3.2. statsd_gauge(key, value) Gauges are a constant data type. They are not subject to averaging and - they donât change unless you change them. That is, once you set a - gauge value, it will be a flat line on the graph until you change it - again. + they don't change unless you change them. That is, once you set a gauge + value, it will be a flat line on the graph until you change it again. - Gauges are useful for things that are already averaged, or donât need + Gauges are useful for things that are already averaged, or don't need to reset periodically This function can be used in ALL ROUTES. @@ -141,10 +140,12 @@ failure_route[tryagain] { The statsd server collects gauges under the stats.gauges prefix. Example 1.4. statsd_set usage +... route [gauge_method]{ statsd_gauge("method"+$rm, "+1"); statsd_gauge("customer_credit"+$var(customer),"$var(customer_credit)"); } +... 3.3. statsd_start(key) @@ -158,7 +159,7 @@ route [gauge_method]{ The statsd server collects all timers under the stats.timers prefix and will calculate the lower bound, mean, 90th percentile, upper bound, and count of each timer for each period (by the time it can be seen in - graphite, thatâs usually per minute). + graphite, that's usually per minute). Example 1.5. statsd_start usage ... @@ -205,6 +206,6 @@ if(geoip_match("$si", "src")){ ... if (t_check_status("408")) { statsd_decr("kamailio.successfulCalls"); - statsd_incr("kamailio.reply.busy"); + statsd_incr("kamailio.reply.timeout"); } ... diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index fbddff49a1..131baca9c5 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -895,7 +895,7 @@ modparam("usrloc", "close_expired_tcp", 1) If set to 1, Kamailio expects to deal with BIGINT type on database columns for expires and last modified values. It allows to handle - better the daylight time adjustmens. If set to 0, those columns are + better the daylight time adjustments. If set to 0, those columns are expected to be on default type 'DATETIME'. When it is 1, the database columns types have to be changed manually to 'BIGINT'.

1 0

git:master:febcf7cd: usrloc Fix README typo
by Olle E. Johansson 22 Aug '17

22 Aug '17

Module: kamailio Branch: master Commit: febcf7cdb29896fb7bc02585b4ac36a5fba5e3ae URL: https://github.com/kamailio/kamailio/commit/febcf7cdb29896fb7bc02585b4ac36a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-08-22T12:30:12+02:00 usrloc Fix README typo --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/febcf7cdb29896fb7bc02585b4ac36a… Patch: https://github.com/kamailio/kamailio/commit/febcf7cdb29896fb7bc02585b4ac36a… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 2ad2935a8d..1dd4ae378a 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1040,7 +1040,7 @@ modparam("usrloc", "close_expired_tcp", 1) <para> If set to 1, &kamailio; expects to deal with BIGINT type on database columns for expires and last modified values. It - allows to handle better the daylight time adjustmens. If set + allows to handle better the daylight time adjustments. If set to 0, those columns are expected to be on default type 'DATETIME'. When it is 1, the database columns types have to be changed manually to 'BIGINT'.

1 0

git:master:4c7fbb1d: statsd Fix strange formatting for apostrophes in the html files by actually using an apostrophe
by Olle E. Johansson 22 Aug '17

22 Aug '17

Module: kamailio Branch: master Commit: 4c7fbb1d6c33ffa6b1630e2b15bcc60934e4dcb3 URL: https://github.com/kamailio/kamailio/commit/4c7fbb1d6c33ffa6b1630e2b15bcc60… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-08-22T12:22:58+02:00 statsd Fix strange formatting for apostrophes in the html files by actually using an apostrophe --- Modified: src/modules/statsd/doc/statsd_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4c7fbb1d6c33ffa6b1630e2b15bcc60… Patch: https://github.com/kamailio/kamailio/commit/4c7fbb1d6c33ffa6b1630e2b15bcc60… --- diff --git a/src/modules/statsd/doc/statsd_admin.xml b/src/modules/statsd/doc/statsd_admin.xml index cd9e830a87..ccf6296fcd 100644 --- a/src/modules/statsd/doc/statsd_admin.xml +++ b/src/modules/statsd/doc/statsd_admin.xml @@ -101,11 +101,11 @@ failure_route[tryagain] { </title> <para> Gauges are a constant data type. They are not subject to averaging - and they don’t change unless you change them. That is, once you set + and they don't change unless you change them. That is, once you set a gauge value, it will be a flat line on the graph until you change it again. </para> <para> - Gauges are useful for things that are already averaged, or don’t need to reset periodically + Gauges are useful for things that are already averaged, or don't need to reset periodically </para> <para> This function can be used in ALL ROUTES. @@ -116,10 +116,12 @@ failure_route[tryagain] { <example> <title><function>statsd_set</function> usage</title> <programlisting format="linespecific"> +... route [gauge_method]{ statsd_gauge("method"+$rm, "+1"); statsd_gauge("customer_credit"+$var(customer),"$var(customer_credit)"); } +... </programlisting> </example> </section> @@ -139,7 +141,7 @@ route [gauge_method]{ <para> The statsd server collects all timers under the stats.timers prefix and will calculate the lower bound, mean, 90th percentile, upper bound, and count of each - timer for each period (by the time it can be seen in graphite, that’s usually per minute). + timer for each period (by the time it can be seen in graphite, that's usually per minute). </para> <example> <title><function>statsd_start</function> usage</title> @@ -215,7 +217,7 @@ if(geoip_match("$si", "src")){ ... if (t_check_status("408")) { statsd_decr("kamailio.successfulCalls"); - statsd_incr("kamailio.reply.busy"); + statsd_incr("kamailio.reply.timeout"); } ... </programlisting>

1 0

git:master:f2f6e7ec: statsc Fix typo in RPC command naming
by Olle E. Johansson 22 Aug '17

22 Aug '17

Module: kamailio Branch: master Commit: f2f6e7ec171fab9dcf8ad7d6c6b25438a54b32af URL: https://github.com/kamailio/kamailio/commit/f2f6e7ec171fab9dcf8ad7d6c6b2543… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-08-22T12:19:54+02:00 statsc Fix typo in RPC command naming --- Modified: src/modules/statsc/doc/statsc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f2f6e7ec171fab9dcf8ad7d6c6b2543… Patch: https://github.com/kamailio/kamailio/commit/f2f6e7ec171fab9dcf8ad7d6c6b2543… --- diff --git a/src/modules/statsc/doc/statsc_admin.xml b/src/modules/statsc/doc/statsc_admin.xml index 4f6c15ace3..1ba4ec8202 100644 --- a/src/modules/statsc/doc/statsc_admin.xml +++ b/src/modules/statsc/doc/statsc_admin.xml @@ -149,9 +149,9 @@ modparam("statsc", "track", "req.received=rcv_requests;rpl.received=rcv_replies" <section> <title>RPC Commands</title> - <section id="statsc.rpc.exec"> + <section id="statsc.rpc.report"> <title> - <function moreinfo="none">statsc.exec</function> + <function moreinfo="none">statsc.report</function> </title> <para> Get the report of recorded statistics.

1 0

git:master:a91b2b68: modules: readme files regenerated - avp ... [skip ci]
by Kamailio Dev 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: a91b2b68c667afb39854ac94fbcfa9cbe6dc49cb URL: https://github.com/kamailio/kamailio/commit/a91b2b68c667afb39854ac94fbcfa9c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-21T17:01:27+02:00 modules: readme files regenerated - avp ... [skip ci] --- Modified: src/modules/avp/README Modified: src/modules/nathelper/README Modified: src/modules/registrar/README Modified: src/modules/sipcapture/README Modified: src/modules/siputils/README Modified: src/modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/a91b2b68c667afb39854ac94fbcfa9c… Patch: https://github.com/kamailio/kamailio/commit/a91b2b68c667afb39854ac94fbcfa9c…

1 0

git:master:4e219eba: topoh: fix documentation typo
by Mikko Lehto 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: 4e219ebae59be64009dc59a28cb158ae4a51db50 URL: https://github.com/kamailio/kamailio/commit/4e219ebae59be64009dc59a28cb158a… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-08-21T17:49:38+03:00 topoh: fix documentation typo --- Modified: src/modules/topoh/doc/topoh_admin.xml Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4e219ebae59be64009dc59a28cb158a… Patch: https://github.com/kamailio/kamailio/commit/4e219ebae59be64009dc59a28cb158a… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index f421f8ce64..1732b77724 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -17,7 +17,7 @@ <title>Overview</title> <para> This module hides the SIP routing headers that show topology details. - It it is not affected by the server being transaction stateless or + It is not affected by the server being transaction stateless or stateful. The script interpreter gets the SIP messages decoded, so all existing functionality is preserved. </para> diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 164087592a..4d41e229b6 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -26,7 +26,7 @@ /*! \defgroup topoh Kamailio :: Topology hiding * * This module hides the SIP routing headers that show topology details. - * It it is not affected by the server being transaction stateless or + * It is not affected by the server being transaction stateless or * stateful. The script interpreter gets the SIP messages decoded, so all * existing functionality is preserved. */

1 0

git:master:e6b6d26d: core, modules: fix common documentation typo
by Mikko Lehto 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: e6b6d26d831b937832969459692b3b06a776a033 URL: https://github.com/kamailio/kamailio/commit/e6b6d26d831b937832969459692b3b0… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-08-21T17:49:38+03:00 core, modules: fix common documentation typo --- Modified: src/core/select.c Modified: src/core/select.h Modified: src/modules/avp/doc/avp_functions.xml Modified: src/modules/seas/seas.c --- Diff: https://github.com/kamailio/kamailio/commit/e6b6d26d831b937832969459692b3b0… Patch: https://github.com/kamailio/kamailio/commit/e6b6d26d831b937832969459692b3b0…

1 0

git:master:c2e74aa2: nathelper: fix documentation typo
by Mikko Lehto 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: c2e74aa28ce20ec9f9eb19197aa829e9c9672a1d URL: https://github.com/kamailio/kamailio/commit/c2e74aa28ce20ec9f9eb19197aa829e… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-08-21T17:49:38+03:00 nathelper: fix documentation typo --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c2e74aa28ce20ec9f9eb19197aa829e… Patch: https://github.com/kamailio/kamailio/commit/c2e74aa28ce20ec9f9eb19197aa829e… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index d08f80c3a5..9c3373a9ec 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -592,7 +592,7 @@ add_rcv_param("1"); # add the parameter to the Contact URI The function creates a URI consisting of the source IP, port, and protocol and stores the URI in an Attribute-Value-Pair. The URI will be appended as "received" parameter to Contact in 200 OK and - registrar will store it in the received cloumn in the location table. + registrar will store it in the received column in the location table. </para> <para> Note: You have to set the <quote>received_avp</quote> parameter of the

1 0

git:master:ff6e3f4d: siputils: fix example typo
by Mikko Lehto 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: ff6e3f4d5a48f2673d4ec33b9a293ddc43c34781 URL: https://github.com/kamailio/kamailio/commit/ff6e3f4d5a48f2673d4ec33b9a293dd… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-08-21T17:49:38+03:00 siputils: fix example typo --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ff6e3f4d5a48f2673d4ec33b9a293dd… Patch: https://github.com/kamailio/kamailio/commit/ff6e3f4d5a48f2673d4ec33b9a293dd… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 2031ad29e9..4b37d8109e 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -569,7 +569,7 @@ tel2sip("$ru", $fd", "$ru"); <title><function>is_e164</function> usage</title> <programlisting format="linespecific"> ... -if (is_164("$fU")) { # Check From header URI user part +if (is_e164("$fU")) { # Check From header URI user part ... } if (is_e164("$avp(i:705)") {

1 0

git:master:6452e86b: sipcapture: documentation typo
by Mikko Lehto 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: 6452e86bcc3e4b927a2e511f3c7a9f464a69ac66 URL: https://github.com/kamailio/kamailio/commit/6452e86bcc3e4b927a2e511f3c7a9f4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-08-21T17:49:38+03:00 sipcapture: documentation typo --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6452e86bcc3e4b927a2e511f3c7a9f4… Patch: https://github.com/kamailio/kamailio/commit/6452e86bcc3e4b927a2e511f3c7a9f4… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index d9d47cceda..c5590b3c1c 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -185,7 +185,7 @@ modparam("sipcapture", "db_insert_mode", 1) <section id="sipcapture.p.capture_on"> <title><varname>capture_on</varname> (integer)</title> <para> - Parameter to enable/disable capture globaly (on(1)/off(0)) + Parameter to enable/disable capture globally (on(1)/off(0)) </para> <para> <emphasis>

1 0

git:master:40d7308f: registrar: fix statistic documentation typo
by Mikko Lehto 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: 40d7308fb6d194a6c5c40c3a6b338cba9c87b253 URL: https://github.com/kamailio/kamailio/commit/40d7308fb6d194a6c5c40c3a6b338cb… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-08-21T17:49:38+03:00 registrar: fix statistic documentation typo --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40d7308fb6d194a6c5c40c3a6b338cb… Patch: https://github.com/kamailio/kamailio/commit/40d7308fb6d194a6c5c40c3a6b338cb… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 98a21dccea..58ea0346d1 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1477,7 +1477,7 @@ event_route[usrloc:contact-expired] { </para> </section> <section> - <title><varname>defaults_expires</varname></title> + <title><varname>default_expires</varname></title> <para> The value of default_expires parameter. </para>

1 0

git:master:496f538e: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: 496f538e2ce8be9ed852a7bf8b1fe118b8971998 URL: https://github.com/kamailio/kamailio/commit/496f538e2ce8be9ed852a7bf8b1fe11… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-21T16:46:27+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/496f538e2ce8be9ed852a7bf8b1fe11… Patch: https://github.com/kamailio/kamailio/commit/496f538e2ce8be9ed852a7bf8b1fe11… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index edc71eb73c..383250d6f7 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -151,7 +151,7 @@ Chapter 1. Admin Guide SIP messages in a database and/or duplicate to the capturing server (using HEP, the Homer encapsulation protocol, or plain SIP mode) - There are two ways of storing information: + There are multiple ways of storing information: * by calling the sip_trace() method explicitely in the Kamailio configuration file. In this case the original message is processed. * by setting the flag equal with the value of “trace_flag” (e.g., @@ -159,6 +159,7 @@ Chapter 1. Admin Guide message sent forward is processed. The logging mechanism is based on TM/SL callbacks, so only messages processed with the TM module or sent statelessly are logged. + * by setting “trace_mode” to mirror all traffic. The tracing can be turned on/off using Kamailio RPC commands.

1 0

git:master:309895b0: siptrace: mention trace_mode in overview
by Mikko Lehto 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: 309895b0a3494f3ac476646779dfd0605e0857f1 URL: https://github.com/kamailio/kamailio/commit/309895b0a3494f3ac476646779dfd06… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-08-21T17:21:16+03:00 siptrace: mention trace_mode in overview - text by Daniel Tryba --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/309895b0a3494f3ac476646779dfd06… Patch: https://github.com/kamailio/kamailio/commit/309895b0a3494f3ac476646779dfd06… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index bceb75200c..32cdc924aa 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -21,7 +21,7 @@ the Homer encapsulation protocol, or plain SIP mode) </para> <para> - There are two ways of storing information: + There are multiple ways of storing information: <itemizedlist> <listitem> <para> @@ -38,6 +38,11 @@ are logged. </para> </listitem> + <listitem> + <para> + by setting <quote>trace_mode</quote> to mirror all traffic. + </para> + </listitem> </itemizedlist> </para>

1 0

git:master:e129b809: http_client Free the old object when the new can't be allocated properly
by Olle E. Johansson 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: e129b809e258d94ea39d66c847db3a19eae2b708 URL: https://github.com/kamailio/kamailio/commit/e129b809e258d94ea39d66c847db3a1… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-08-21T12:19:30+02:00 http_client Free the old object when the new can't be allocated properly --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/e129b809e258d94ea39d66c847db3a1… Patch: https://github.com/kamailio/kamailio/commit/e129b809e258d94ea39d66c847db3a1… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 9a87865837..4789c73f30 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -172,7 +172,7 @@ curl_con_pkg_t* curl_get_pkg_connection(curl_con_t *con) } ccp = ccp->next; } - LM_DBG("curl_get_pkg_connection no success in looking for pkg memory for httpcon: [%.*s]\n", con->name.len, con->name.s); + LM_ERR("curl_get_pkg_connection no success in looking for pkg memory for httpcon: [%.*s]\n", con->name.len, con->name.s); return NULL; } @@ -751,8 +751,9 @@ curl_con_t *curl_init_con(str *name) ccp = (curl_con_pkg_t*) pkg_malloc(sizeof(curl_con_pkg_t)); if(ccp == NULL) { - shm_free(ccp); - LM_ERR("no shm memory\n"); + /* We failed to allocate ccp, so let's free cc and quit */ + shm_free(cc); + LM_ERR("no pkg memory available\n"); return NULL; }

1 0

git:master:4447dc86: core: parser contact - removed history, updated log macros
by Daniel-Constantin Mierla 21 Aug '17

21 Aug '17

Module: kamailio Branch: master Commit: 4447dc8619f7136bca127efadaad4bce6f8e0e91 URL: https://github.com/kamailio/kamailio/commit/4447dc8619f7136bca127efadaad4bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-21T07:43:44+02:00 core: parser contact - removed history, updated log macros - coherent indentation --- Modified: src/core/parser/contact/contact.c Modified: src/core/parser/contact/parse_contact.c --- Diff: https://github.com/kamailio/kamailio/commit/4447dc8619f7136bca127efadaad4bc… Patch: https://github.com/kamailio/kamailio/commit/4447dc8619f7136bca127efadaad4bc…

1 0

git:master:12c57dbe: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 20 Aug '17

20 Aug '17

Module: kamailio Branch: master Commit: 12c57dbee20d809ee6b43fc56fdb37e38bd60916 URL: https://github.com/kamailio/kamailio/commit/12c57dbee20d809ee6b43fc56fdb37e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-20T08:01:29+02:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/12c57dbee20d809ee6b43fc56fdb37e… Patch: https://github.com/kamailio/kamailio/commit/12c57dbee20d809ee6b43fc56fdb37e…

1 0

git:master:804f9e85: kex: documentation for core.modules rpc command
by Daniel-Constantin Mierla 20 Aug '17

20 Aug '17

Module: kamailio Branch: master Commit: 804f9e85ce84d45dcb6a7b4d5202b050b5289cc4 URL: https://github.com/kamailio/kamailio/commit/804f9e85ce84d45dcb6a7b4d5202b05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-20T08:00:41+02:00 kex: documentation for core.modules rpc command --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/804f9e85ce84d45dcb6a7b4d5202b05… Patch: https://github.com/kamailio/kamailio/commit/804f9e85ce84d45dcb6a7b4d5202b05… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 6c588a31b5..7eabc02160 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -668,6 +668,26 @@ resetdebug(); ... </programlisting> </section> + <section id="kex.r.core.modules"> + <title> + <function moreinfo="none">core.modules</function> + </title> + <para> + List loaded modules in config. + </para> + <para> + Name: <emphasis>core.modules</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis>.</para> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +&kamcmd; core.modules +... + </programlisting> + </section> <section id="kex.r.pkg.stats"> <title>

1 0

git:master:5ead6c08: core: digest parser - converted old log macros
by Daniel-Constantin Mierla 19 Aug '17

19 Aug '17

Module: kamailio Branch: master Commit: 5ead6c080d2a9c3e5e6adc56a717003bef37c9dd URL: https://github.com/kamailio/kamailio/commit/5ead6c080d2a9c3e5e6adc56a717003… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-19T07:05:03+02:00 core: digest parser - converted old log macros - coherent indentation --- Modified: src/core/parser/digest/digest.c --- Diff: https://github.com/kamailio/kamailio/commit/5ead6c080d2a9c3e5e6adc56a717003… Patch: https://github.com/kamailio/kamailio/commit/5ead6c080d2a9c3e5e6adc56a717003…

1 0

git:master:1121ee05: core: added rpc command core.modules
by Daniel-Constantin Mierla 18 Aug '17

18 Aug '17

Module: kamailio Branch: master Commit: 1121ee05e982625e31045416473b00be1caf481c URL: https://github.com/kamailio/kamailio/commit/1121ee05e982625e31045416473b00b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-18T07:24:20+02:00 core: added rpc command core.modules - list the names of loaded modules --- Modified: src/core/core_cmd.c Modified: src/core/sr_module.c Modified: src/core/sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/1121ee05e982625e31045416473b00b… Patch: https://github.com/kamailio/kamailio/commit/1121ee05e982625e31045416473b00b… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index ed8d71749e..a489a8975d 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -959,6 +959,26 @@ static void core_sockets_list(rpc_t* rpc, void* c) /** * */ +static const char* core_modules_doc[] = { + "List loaded modules", /* Documentation string */ + 0 /* Method signature(s) */ +}; + +/** + * list listen sockets for SIP server + */ +static void core_modules(rpc_t* rpc, void* c) +{ + sr_module_t* t; + + for(t = get_loaded_modules(); t; t = t->next) { + if (rpc->add(c, "s", t->exports.name) < 0) return; + } +} + +/** + * + */ static const char* core_ppdefines_doc[] = { "List preprocessor defines", /* Documentation string */ 0 /* Method signature(s) */ @@ -1014,7 +1034,8 @@ static rpc_export_t core_rpc_methods[] = { 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, - {"core.ppdefines", core_ppdefines, core_ppdefines_doc, RET_ARRAY}, + {"core.modules", core_modules, core_modules_doc, RET_ARRAY}, + {"core.ppdefines", core_ppdefines, core_ppdefines_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 }, diff --git a/src/core/sr_module.c b/src/core/sr_module.c index fe545378eb..489ae55593 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -781,6 +781,9 @@ struct sr_module* find_module_by_name(char* mod) { return 0; } +sr_module_t* get_loaded_modules(void) { + return modules; +} /*! * \brief Find a parameter with given type diff --git a/src/core/sr_module.h b/src/core/sr_module.h index e2bef74950..4dd6523f3b 100644 --- a/src/core/sr_module.h +++ b/src/core/sr_module.h @@ -435,13 +435,13 @@ union module_exports_u { }; -struct sr_module { +typedef struct sr_module { char* path; void* handle; unsigned int orig_mod_interface_ver; struct sr31_module_exports exports; struct sr_module* next; -}; +} sr_module_t; extern struct sr_module* modules; /**< global module list*/ @@ -459,6 +459,7 @@ void destroy_modules(void); int init_child(int rank); int init_modules(void); struct sr_module* find_module_by_name(char* mod); +sr_module_t* get_loaded_modules(void); /**< true if the module with name 'mod_name' is loaded */ #define module_loaded(mod_name) (find_module_by_name(mod_name)!=0)

1 0

append_branch and tls
by James Cloos 17 Aug '17

17 Aug '17

When using rewrite_ruri() and append_branch() to set a list of next hops to try, what is the proper syntax to specify that a given route should use tcp or tls/tcp? I've mostly used a single next hop via t_relay_to_tcp() or t_relay_to_tls(), but need route stacks now. -JimC -- James Cloos <cloos(a)jhcloos.com> OpenPGP: 0x997A9F17ED7DAEA6

1 0

Converting to kemi
by James Cloos 17 Aug '17

17 Aug '17

I'm working on converting some configs to kemi lua and have a couple of questions: First: Does KSR.pv.get() support multiple pseudos in a single call? The examples such as misc/examples/kemi/kamailio-basic-kemi-lua.lua make several calls, but also do things like KSR.pv.get("$T_branch_idx]") to avoid having the append "]" to the string. That makes me wonder why that file has code like this: KSR.dbg("new branch [".. KSR.pv.get("$T_branch_idx]") .. " to ".. KSR.pv.get("$ru") .. "\n"); instead of like: KSR.pv.get("[$T_branch_idx] to $ru\n") Second: Is it still the case that, eg, event_route[xhttp:request] cannot be in the kemi lua code? There was another. Perhaps I'll recall what it was... :( -JimC -- James Cloos <cloos(a)jhcloos.com> OpenPGP: 0x997A9F17ED7DAEA6

1 0

[kamailio/kamailio] pv: add string corehash transform (#1218)
by lazedo 17 Aug '17

17 Aug '17

#### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  adds string transform with optional size parameter to return the slot if supplied `usage` - $(var(myvar){s.corehash}) `returns the hash` - $(var(myvar){s.corehash, 32}) `returns the slot` `would be great if this can be backported to branch 5.0 and included in next week release` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1218 -- Commit Summary -- * pv: add string corehash transform -- File Changes -- M src/modules/pv/pv_trans.c (48) M src/modules/pv/pv_trans.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1218.patch https://github.com/kamailio/kamailio/pull/1218.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/1218

2 4

[kamailio/kamailio] make get_hdr_by_name/next_sibling_hdr_by_name case insensitive (#1217)
by nevian427 17 Aug '17

17 Aug '17

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description core: make get_hdr_by_name/next_sibling_hdr_by_name case insensitive - Credits goes to Alexandr Dubovikov You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1217 -- Commit Summary -- * caseinsensitive get_hdr_by_name/next_sibling_hdr_by_name -- File Changes -- M src/core/parser/msg_parser.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1217.patch https://github.com/kamailio/kamailio/pull/1217.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/1217

2 9

git:master:4072b0f9: core: parser - use case insensitive comparison to get header by name
by Daniel-Constantin Mierla 17 Aug '17

17 Aug '17

Module: kamailio Branch: master Commit: 4072b0f9fbc084a4f4640e1b4272b7f8495cd1bb URL: https://github.com/kamailio/kamailio/commit/4072b0f9fbc084a4f4640e1b4272b7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-17T13:42:59+02:00 core: parser - use case insensitive comparison to get header by name - same for next sibling header - GH #1217 --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/4072b0f9fbc084a4f4640e1b4272b7f… Patch: https://github.com/kamailio/kamailio/commit/4072b0f9fbc084a4f4640e1b4272b7f… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index be137652de..efad8f9f63 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -962,7 +962,7 @@ hdr_field_t* get_hdr_by_name(const sip_msg_t* const msg, const char* const name, for(hdr = msg->headers; hdr; hdr = hdr->next) { if(hdr->name.len == name_len && *hdr->name.s==*name - && strncmp(hdr->name.s, name, name_len)==0) + && strncasecmp(hdr->name.s, name, name_len)==0) return hdr; } return NULL; @@ -975,7 +975,7 @@ hdr_field_t* next_sibling_hdr_by_name(const hdr_field_t* const hf) for(hdr = hf->next; hdr; hdr = hdr->next) { if(hdr->name.len == hf->name.len && *hdr->name.s==*hf->name.s - && strncmp(hdr->name.s, hf->name.s, hf->name.len)==0) + && strncasecmp(hdr->name.s, hf->name.s, hf->name.len)==0) return hdr; } return NULL;

1 0

git:master:bf97c8ac: pv: small adjustments for {s.corehash} transformation
by Daniel-Constantin Mierla 17 Aug '17

17 Aug '17

Module: kamailio Branch: master Commit: bf97c8acd67c0151c70da812402d3eef79388f83 URL: https://github.com/kamailio/kamailio/commit/bf97c8acd67c0151c70da812402d3ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-17T13:23:08+02:00 pv: small adjustments for {s.corehash} transformation - use standard uint32_t type and internal function to convert to str --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/bf97c8acd67c0151c70da812402d3ee… Patch: https://github.com/kamailio/kamailio/commit/bf97c8acd67c0151c70da812402d3ee… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 603219bf4e..dd7d9a7f62 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -266,7 +266,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, str st, st2; pv_value_t v, w; time_t t; - uint sz1, sz2; + uint32_t sz1, sz2; if(val==NULL || val->flags&PV_VAL_NULL) return -1; @@ -1125,7 +1125,9 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_S_COREHASH: if(!(val->flags&PV_VAL_STR)) - val->rs.s = int2str(val->ri, &val->rs.len); + st.s = int2str(val->ri, &st.len); + else + st = val->rs; sz1 = 0; if(tp != NULL) { @@ -1143,13 +1145,15 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } } - sz2 = core_hash(&val->rs, NULL, sz1); + sz2 = core_hash(&st, NULL, sz1); - j = sprintf(_tr_buffer, "%u", sz2); + if((val->rs.s = int2strbuf((unsigned long)sz2, _tr_buffer, + INT2STR_MAX_LEN, &val->rs.len))==NULL) { + LM_ERR("failed to convert core hash id to string\n"); + return -1; + } val->flags = PV_VAL_STR; val->ri = 0; - val->rs.s = _tr_buffer; - val->rs.len = j; break; default:

1 0

git:master:38c85975: Merge pull request #1218 from kamailio/corehash_trans
by GitHub 17 Aug '17

17 Aug '17

Module: kamailio Branch: master Commit: 38c85975e3b4a9f1dc548f7bda1f54726fba3d44 URL: https://github.com/kamailio/kamailio/commit/38c85975e3b4a9f1dc548f7bda1f547… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-08-17T12:46:01+02:00 Merge pull request #1218 from kamailio/corehash_trans pv: add string corehash transform --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/38c85975e3b4a9f1dc548f7bda1f547… Patch: https://github.com/kamailio/kamailio/commit/38c85975e3b4a9f1dc548f7bda1f547… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index eccf3b6377..603219bf4e 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -39,6 +39,7 @@ #include "../../core/dset.h" #include "../../core/basex.h" #include "../../core/action.h" +#include "../../core/hashes.h" #include "../../core/parser/parse_param.h" #include "../../core/parser/parse_uri.h" @@ -265,6 +266,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, str st, st2; pv_value_t v, w; time_t t; + uint sz1, sz2; if(val==NULL || val->flags&PV_VAL_NULL) return -1; @@ -1121,6 +1123,35 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs = st; break; + case TR_S_COREHASH: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + + sz1 = 0; + if(tp != NULL) { + if(tp->type==TR_PARAM_NUMBER) { + sz1 = (uint) tp->v.n; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_INT))) + { + LM_ERR("corehash cannot get size (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + sz1 = (uint) v.ri; + } + } + + sz2 = core_hash(&val->rs, NULL, sz1); + + j = sprintf(_tr_buffer, "%u", sz2); + val->flags = PV_VAL_STR; + val->ri = 0; + val->rs.s = _tr_buffer; + val->rs.len = j; + break; + default: LM_ERR("unknown subtype %d (cfg line: %d)\n", subtype, get_cfg_crt_line()); @@ -2395,6 +2426,23 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==8 && strncasecmp(name.s, "corehash", 8)==0) { + t->subtype = TR_S_COREHASH; + if(*p==TR_PARAM_MARKER) + { + p++; + _tr_parse_nparam(p, p0, tp, spec, n, sign, in, s); + t->params = tp; + } + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid corehash transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } else if(name.len==4 && strncasecmp(name.s, "trim", 4)==0) { t->subtype = TR_S_TRIM; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 764653e5e3..aacb722b95 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -41,7 +41,7 @@ enum _tr_s_subtype { TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, - TR_S_ENCODEBASE58, TR_S_DECODEBASE58 + TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

git:master:74563696: pv: add string corehash transform
by lazedo 17 Aug '17

17 Aug '17

Module: kamailio Branch: master Commit: 74563696fa064b7cbe169e9af1020ba840c8b8ab URL: https://github.com/kamailio/kamailio/commit/74563696fa064b7cbe169e9af1020ba… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-08-17T03:04:20+01:00 pv: add string corehash transform optional size parameter to return the slot if supplied example $(var(myvar){s.corehash}) returns the hash $(var(myvar){s.corehash, 32}) returns the slot --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/74563696fa064b7cbe169e9af1020ba… Patch: https://github.com/kamailio/kamailio/commit/74563696fa064b7cbe169e9af1020ba… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index eccf3b6377..603219bf4e 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -39,6 +39,7 @@ #include "../../core/dset.h" #include "../../core/basex.h" #include "../../core/action.h" +#include "../../core/hashes.h" #include "../../core/parser/parse_param.h" #include "../../core/parser/parse_uri.h" @@ -265,6 +266,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, str st, st2; pv_value_t v, w; time_t t; + uint sz1, sz2; if(val==NULL || val->flags&PV_VAL_NULL) return -1; @@ -1121,6 +1123,35 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs = st; break; + case TR_S_COREHASH: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + + sz1 = 0; + if(tp != NULL) { + if(tp->type==TR_PARAM_NUMBER) { + sz1 = (uint) tp->v.n; + } else { + if(pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_INT))) + { + LM_ERR("corehash cannot get size (cfg line: %d)\n", + get_cfg_crt_line()); + return -1; + } + sz1 = (uint) v.ri; + } + } + + sz2 = core_hash(&val->rs, NULL, sz1); + + j = sprintf(_tr_buffer, "%u", sz2); + val->flags = PV_VAL_STR; + val->ri = 0; + val->rs.s = _tr_buffer; + val->rs.len = j; + break; + default: LM_ERR("unknown subtype %d (cfg line: %d)\n", subtype, get_cfg_crt_line()); @@ -2395,6 +2426,23 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==8 && strncasecmp(name.s, "corehash", 8)==0) { + t->subtype = TR_S_COREHASH; + if(*p==TR_PARAM_MARKER) + { + p++; + _tr_parse_nparam(p, p0, tp, spec, n, sign, in, s); + t->params = tp; + } + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid corehash transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } else if(name.len==4 && strncasecmp(name.s, "trim", 4)==0) { t->subtype = TR_S_TRIM; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 764653e5e3..aacb722b95 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -41,7 +41,7 @@ enum _tr_s_subtype { TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, - TR_S_ENCODEBASE58, TR_S_DECODEBASE58 + TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev