sr-dev April 2019

sr-dev@lists.kamailio.org

23 participants
318 discussions

Forced update on master?
by Mikko Lehto 02 Apr '19

02 Apr '19

Hi Was there rebase done (accidentally or on purpose) in master branch lately? I ask because typically fast forward merge just flys through without excitement, but not this time: --- $ git fetch remote: Enumerating objects: 149, done. remote: Counting objects: 100% (149/149), done. remote: Compressing objects: 100% (11/11), done. remote: Total 198 (delta 138), reused 147 (delta 137), pack-reused 49 Receiving objects: 100% (198/198), 43.82 KiB | 1.46 MiB/s, done. Resolving deltas: 100% (144/144), completed with 48 local objects. >From github.com:kamailio/kamailio + a15210d06...ce8d36f30 master -> origin/master (forced update) a7f6227ef..d36634a36 5.2 -> origin/5.2 $ git pull --ff-only fatal: Not possible to fast-forward, aborting. --- I did not forcefully merge local master yet, so my current local HEAD is: --- $ git show HEAD commit a15210d064e08ac8b1a271502360b7066bff43b6 (HEAD -> master) Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Mar 28 19:33:22 2019 +0100 app_lua: get lua execution stack for previous level - returns the info where current function was executed --- And my recently fetched origin/HEAD is: --- $ git show origin/HEAD commit ce8d36f301d7688255597a67693e47dc14448650 (origin/master, origin/HEAD) Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 2 17:09:53 2019 +0200 lib/srdb1: use system time to compute db query execution duration --- If I read "git log --graph --decorate" output correctly, their common ancestor is: --- * | commit 1b6332fe565d97695a1eb84172e6f19f26381101 | | Author: sergey-safarov <s.safarov(a)gmail.com> | | Date: Wed Mar 27 10:43:42 2019 +0300 | | | | ipops: Fixed mask for 172.16.0.0/12 network (#1907) --- >From github web interface I can load same commit as is my local HEAD: https://github.com/kamailio/kamailio/commit/a15210d064e08ac8b1a271502360b70… And it looks that commit is also known as: https://github.com/kamailio/kamailio/commit/fb99f748db187d2699b6c050cf16f3f… I try to figure out if something is happening on my end, but meanwhile I must ask is it just me or did anyone else exprience this? Best regards -- Mikko

2 2

Re: [sr-dev] [SR-Users] ENUM for CNAM dips
by Henning Westerholt 02 Apr '19

02 Apr '19

Am Montag, 1. April 2019, 19:22:13 CEST schrieb Spencer Thomason: > I’m interested in extending the ENUM module to add support for > draft-ietf-enum-cnam-08 CNAM queries using ENUM. I’m looking for high > level guidance as to the best way to implement this and any feedback on > naming of exported functions and parameters. Maybe something like > enum_cnam_query("pvar", "destination", [,"suffix" [,"service"]]) ? Hello Spencer, (added sr-dev) thank you for your interesting in contribution to Kamailio. I am not the author of the enum module - but your suggestion: enum_cnam_query("pvar", "destination", [,"suffix" [,"service"]]) sounds fine for me. This fits to the existing function naming. If you have specific questions regarding coding topics please use our developer mailing list (sr-dev). We integrate new code usually with github, you find a guide here: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md Best regards, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

1 0

git:master:ce8d36f3: lib/srdb1: use system time to compute db query execution duration
by Daniel-Constantin Mierla 02 Apr '19

02 Apr '19

Module: kamailio Branch: master Commit: ce8d36f301d7688255597a67693e47dc14448650 URL: https://github.com/kamailio/kamailio/commit/ce8d36f301d7688255597a67693e47d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-02T17:09:53+02:00 lib/srdb1: use system time to compute db query execution duration --- Modified: src/lib/srdb1/db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/ce8d36f301d7688255597a67693e47d… Patch: https://github.com/kamailio/kamailio/commit/ce8d36f301d7688255597a67693e47d… --- diff --git a/src/lib/srdb1/db_query.c b/src/lib/srdb1/db_query.c index e6f237d654..8510999aba 100644 --- a/src/lib/srdb1/db_query.c +++ b/src/lib/srdb1/db_query.c @@ -32,6 +32,7 @@ #include <stdio.h> #include <stdlib.h> +#include <time.h> #include "../../core/dprint.h" #include "db_ut.h" #include "db_query.h" @@ -45,19 +46,26 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, int (*submit_query)(const db1_con_t*, const str*)) { int ret; - unsigned int ms = 0; + struct timeval tvb, tve; + struct timezone tz; + unsigned int tdiff; - if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) - ms = TICKS_TO_MS(get_ticks_raw()); + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tvb, &tz); + } ret = submit_query(_h, _query); - if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) { - ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_db)) { - LOG(cfg_get(core, core_cfg, latency_log), - "alert - query execution too long [%u ms] for [%.*s]\n", - ms, _query->len<50?_query->len:50, _query->s); + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + gettimeofday(&tve, &tz); + tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 + + (tve.tv_usec - tvb.tv_usec); + if(tdiff >= cfg_get(core, core_cfg, latency_limit_db)) { + LOG(cfg_get(core, core_cfg, latency_log), + "alert - query execution too long [%u us] for [%.*s]\n", + tdiff, _query->len<100?_query->len:100, _query->s); } }

1 0

git:master:7560edb8: lib/srdb1: use the proper field for latency db limit
by Daniel-Constantin Mierla 02 Apr '19

02 Apr '19

Module: kamailio Branch: master Commit: 7560edb8aac6b60a5c4392db21c16e4096bf529d URL: https://github.com/kamailio/kamailio/commit/7560edb8aac6b60a5c4392db21c16e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-04-02T13:45:56+02:00 lib/srdb1: use the proper field for latency db limit --- Modified: src/lib/srdb1/db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/7560edb8aac6b60a5c4392db21c16e4… Patch: https://github.com/kamailio/kamailio/commit/7560edb8aac6b60a5c4392db21c16e4… --- diff --git a/src/lib/srdb1/db_query.c b/src/lib/srdb1/db_query.c index 4bb235fab1..e6f237d654 100644 --- a/src/lib/srdb1/db_query.c +++ b/src/lib/srdb1/db_query.c @@ -47,14 +47,14 @@ static inline int db_do_submit_query(const db1_con_t* _h, const str *_query, int ret; unsigned int ms = 0; - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) ms = TICKS_TO_MS(get_ticks_raw()); ret = submit_query(_h, _query); - if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { + if(unlikely(cfg_get(core, core_cfg, latency_limit_db)>0)) { ms = TICKS_TO_MS(get_ticks_raw()) - ms; - if(ms >= cfg_get(core, core_cfg, latency_limit_action)) { + if(ms >= cfg_get(core, core_cfg, latency_limit_db)) { LOG(cfg_get(core, core_cfg, latency_log), "alert - query execution too long [%u ms] for [%.*s]\n", ms, _query->len<50?_query->len:50, _query->s);

1 0

[kamailio/kamailio] Changed default db_redis location schema type for timestamps. Fixes i… (#1918)
by Joan 02 Apr '19

02 Apr '19

#### Pre-Submission Checklist - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #1917 #### Description Changed default db_redis location schema type of expires and last_modified from int to timestamp. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1918 -- Commit Summary -- * Changed default db_redis location schema type for timestamps. Fixes issue reported by Joan Salvatella #1917 -- File Changes -- M utils/kamctl/db_redis/kamailio/location (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1918.patch https://github.com/kamailio/kamailio/pull/1918.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/1918

3 4

[kamailio/kamailio] db_redis location schema (#1917)
by Joan 02 Apr '19

02 Apr '19

### Description Configured the location module to load the expires column as a datetime instead of an integer but db_redis ignored the parameter and loaded the data with the default schema. As of today, the default schema has last_modified and expires columns as integers but stores them as timestamps. ``` id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/**int**,q/double,callid/string,cseq/int,last_modified/**int**,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9 ``` ### Troubleshooting #### Reproduction Use db_redis as backend and use the location module. While handling INVITE: if (!lookup("location")) { sl_send_reply("404", "User Not Found"); return; } While handling REGISTER: if (!save("location")) sl_reply_error(); #### Debugging Data #### Log Messages ``` 8(34) ERROR: <core> [db_ut.c:92]: db_str2int(): Unexpected characters: [-04-01 07:17:14] 8(34) ERROR: <core> [db_val.c:76]: db_str2val(): error while converting integer value from string 8(34) ERROR: db_redis [redis_dbase.c:1062]: db_redis_convert_row(): Failed to convert redis column 'expires' to db value 8(34) ERROR: db_redis [redis_dbase.c:1231]: db_redis_perform_query(): Failed to convert redis reply for row 8(34) ERROR: db_redis [redis_dbase.c:1243]: db_redis_perform_query(): failed to perform the query 8(34) ERROR: db_redis [redis_dbase.c:1829]: db_redis_query(): failed to do the query 8(34) ERROR: usrloc [udomain.c:641]: db_load_urecord(): db_query failed ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions I patched the default schema with the following and it worked. ``` id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/**timestamp**,q/double,callid/string,cseq/int,last_modified/**timestamp**,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 ``` * **Operating System**:  ``` Linux gke-production-cluster-default-pool-fb621121-qz3r 4.14.65+ #1 SMP Thu Oct 25 10:42:50 PDT 2018 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/1917

3 4

git:5.2:d36634a3: kamctl: regenerate db schema files
by Victor Seva 02 Apr '19

02 Apr '19

Module: kamailio Branch: 5.2 Commit: d36634a3628ef21088b9930108a0ce845ccc38d6 URL: https://github.com/kamailio/kamailio/commit/d36634a3628ef21088b9930108a0ce8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-02T11:31:12+02:00 kamctl: regenerate db schema files --- Modified: utils/kamctl/db_redis/kamailio/location --- Diff: https://github.com/kamailio/kamailio/commit/d36634a3628ef21088b9930108a0ce8… Patch: https://github.com/kamailio/kamailio/commit/d36634a3628ef21088b9930108a0ce8… --- diff --git a/utils/kamctl/db_redis/kamailio/location b/utils/kamctl/db_redis/kamailio/location index 9ca18f2fb0..7c0ea2ab81 100644 --- a/utils/kamctl/db_redis/kamailio/location +++ b/utils/kamctl/db_redis/kamailio/location @@ -1,2 +1,2 @@ -id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/int,q/double,callid/string,cseq/int,last_modified/int,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, +id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/time,q/double,callid/string,cseq/int,last_modified/time,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9

1 0

git:5.2:0853dd48: lib/srdb1: update location types for db_redis
by Victor Seva 02 Apr '19

02 Apr '19

Module: kamailio Branch: 5.2 Commit: 0853dd48f40e4d91c207e5f4f01b4edeb34ef187 URL: https://github.com/kamailio/kamailio/commit/0853dd48f40e4d91c207e5f4f01b4ed… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-02T11:30:08+02:00 lib/srdb1: update location types for db_redis changed introduced directly at c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea (cherry picked from commit 741f7c08a86fc101a4f0290192dcbacff1673575) --- Modified: src/lib/srdb1/schema/location.xml --- Diff: https://github.com/kamailio/kamailio/commit/0853dd48f40e4d91c207e5f4f01b4ed… Patch: https://github.com/kamailio/kamailio/commit/0853dd48f40e4d91c207e5f4f01b4ed… --- diff --git a/src/lib/srdb1/schema/location.xml b/src/lib/srdb1/schema/location.xml index f951f1f4e0..f923394144 100644 --- a/src/lib/srdb1/schema/location.xml +++ b/src/lib/srdb1/schema/location.xml @@ -89,6 +89,7 @@ <column id="expires"> <name>expires</name> <type>datetime</type> + <type db="db_redis">time</type> <default>&DEFAULT_ALIASES_EXPIRES;</default> <default db="oracle">to_date('&DEFAULT_ALIASES_EXPIRES;','yyyy-mm-dd hh24:mi:ss')</default> <description>Date and time when this entry expires.</description> @@ -121,6 +122,7 @@ <column> <name>last_modified</name> <type>datetime</type> + <type db="db_redis">time</type> <default>&DEFAULT_DATETIME;</default> <default db="oracle">to_date('&DEFAULT_DATETIME;','yyyy-mm-dd hh24:mi:ss')</default> <description>Date and time when this entry was last modified.</description>

1 0

[kamailio/kamailio] db_redis: fix schema (#1919)
by Victor Seva 02 Apr '19

02 Apr '19

manual schema changes introduced at c9f2aa71b2e0d4a4f71b3da92f97306e86f93eea were lost by regeneration at 5e0440aa27154c263fc883f3a7cb9680805af6c3 This change sets the types changes at location for db_redis You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1919 -- Commit Summary -- * lib/srdb1: update location types for db_redis * kamctl: regenerated db schema files -- File Changes -- M src/lib/srdb1/schema/location.xml (2) M utils/kamctl/db_redis/kamailio/location (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1919.patch https://github.com/kamailio/kamailio/pull/1919.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/1919

2 2

git:master:ae54cf7b: kamctl: regenerated db schema files
by Victor Seva 02 Apr '19

02 Apr '19

Module: kamailio Branch: master Commit: ae54cf7bf6c268a3fef8834a57991601e3487d57 URL: https://github.com/kamailio/kamailio/commit/ae54cf7bf6c268a3fef8834a5799160… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-04-02T11:28:05+02:00 kamctl: regenerated db schema files restore db_redis location changes --- Modified: utils/kamctl/db_redis/kamailio/location --- Diff: https://github.com/kamailio/kamailio/commit/ae54cf7bf6c268a3fef8834a5799160… Patch: https://github.com/kamailio/kamailio/commit/ae54cf7bf6c268a3fef8834a5799160… --- diff --git a/utils/kamctl/db_redis/kamailio/location b/utils/kamctl/db_redis/kamailio/location index 9ca18f2fb0..7c0ea2ab81 100644 --- a/utils/kamctl/db_redis/kamailio/location +++ b/utils/kamctl/db_redis/kamailio/location @@ -1,2 +1,2 @@ -id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/int,q/double,callid/string,cseq/int,last_modified/int,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, +id/int,ruid/string,username/string,domain/string,contact/string,received/string,path/string,expires/time,q/double,callid/string,cseq/int,last_modified/time,flags/int,cflags/int,user_agent/string,socket/string,methods/int,instance/string,reg_id/int,server_id/int,connection_id/int,keepalive/int,partition/int, 9

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2019