- sr-dev - kamailio.org

git:master:f9c7c127: app_ruby: docs - added to example how to get value for pv
by Daniel-Constantin Mierla 31 May '18

31 May '18

Module: kamailio Branch: master Commit: f9c7c127acf7320356e978eb13821b5e0a89f30d URL: https://github.com/kamailio/kamailio/commit/f9c7c127acf7320356e978eb13821b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T09:40:11+02:00 app_ruby: docs - added to example how to get value for pv --- Modified: src/modules/app_ruby/doc/app_ruby_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f9c7c127acf7320356e978eb13821b5… Patch: https://github.com/kamailio/kamailio/commit/f9c7c127acf7320356e978eb13821b5… --- diff --git a/src/modules/app_ruby/doc/app_ruby_admin.xml b/src/modules/app_ruby/doc/app_ruby_admin.xml index b6773785d1..bbebe1d6e3 100644 --- a/src/modules/app_ruby/doc/app_ruby_admin.xml +++ b/src/modules/app_ruby/doc/app_ruby_admin.xml @@ -172,7 +172,7 @@ ruby_run("rb_funcx", "$rU", "2"); <programlisting format="linespecific"> ... def ksr_sl_reply() - KSR.dbg("==== from ruby\n") + KSR.dbg("==== from ruby - src ip: " + KSR::PV.get("$si") + "\n") KSR::SL.sl_send_reply(200, "OK-Ruby") end ...

1 0

git:master:c173ab86: app_ruby: implemented KSR::PV kemi exports
by Daniel-Constantin Mierla 31 May '18

31 May '18

Module: kamailio Branch: master Commit: c173ab860670cbc03cb8cd3027e033ff67b02a45 URL: https://github.com/kamailio/kamailio/commit/c173ab860670cbc03cb8cd3027e033f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-31T08:24:44+02:00 app_ruby: implemented KSR::PV kemi exports --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/c173ab860670cbc03cb8cd3027e033f… Patch: https://github.com/kamailio/kamailio/commit/c173ab860670cbc03cb8cd3027e033f…

1 0

git:master:0a14914f: carrierroute: rename boolean type conflicting with clang sdtbool
by Daniel-Constantin Mierla 30 May '18

30 May '18

Module: kamailio Branch: master Commit: 0a14914fc1f98c18b9b75f66fe2e71f15147c9bf URL: https://github.com/kamailio/kamailio/commit/0a14914fc1f98c18b9b75f66fe2e71f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-30T20:17:11+02:00 carrierroute: rename boolean type conflicting with clang sdtbool In file included from carrierroute.c:51: ./cr_db.h:92:2: error: expected identifier false = 0, ^ /usr/lib/clang/9.1.0/include/stdbool.h:33:15: note: expanded from macro 'false' #define false 0 --- Modified: src/modules/carrierroute/cr_db.c Modified: src/modules/carrierroute/cr_db.h --- Diff: https://github.com/kamailio/kamailio/commit/0a14914fc1f98c18b9b75f66fe2e71f… Patch: https://github.com/kamailio/kamailio/commit/0a14914fc1f98c18b9b75f66fe2e71f… --- diff --git a/src/modules/carrierroute/cr_db.c b/src/modules/carrierroute/cr_db.c index 010f99d715..ce9667b38a 100644 --- a/src/modules/carrierroute/cr_db.c +++ b/src/modules/carrierroute/cr_db.c @@ -353,7 +353,7 @@ int load_route_data_db(struct route_data_t * rd) { } } int n = 0; - boolean query_done = false; + crboolean query_done = crfalse; do { LM_DBG("loading, cycle %d", n++); for (i = 0; i < RES_ROW_N(res); ++i) { @@ -421,7 +421,7 @@ int load_route_data_db(struct route_data_t * rd) { } if(RES_ROW_N(prob_res) == 0) { LM_ERR("Carrierroute db table contains route(s) with only 0 probability.\n"); - query_done = true; + query_done = crtrue; } carrierroute_dbf.free_result(carrierroute_dbh, prob_res); prob_res = NULL; diff --git a/src/modules/carrierroute/cr_db.h b/src/modules/carrierroute/cr_db.h index ffea731192..255b627c54 100644 --- a/src/modules/carrierroute/cr_db.h +++ b/src/modules/carrierroute/cr_db.h @@ -89,8 +89,8 @@ int load_route_data_db (struct route_data_t * rd); int load_user_carrier(str * user, str * domain); typedef enum { - false = 0, - true = 1 -} boolean; + crfalse = 0, + crtrue = 1 +} crboolean; #endif

1 0

git:master:acdace7c: modules: readme files regenerated - app_ruby ... [skip ci]
by Kamailio Dev 30 May '18

30 May '18

Module: kamailio Branch: master Commit: acdace7c846ce68a990a2b201d93caad878a03e5 URL: https://github.com/kamailio/kamailio/commit/acdace7c846ce68a990a2b201d93caa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-30T18:31:35+02:00 modules: readme files regenerated - app_ruby ... [skip ci] --- Modified: src/modules/app_ruby/README --- Diff: https://github.com/kamailio/kamailio/commit/acdace7c846ce68a990a2b201d93caa… Patch: https://github.com/kamailio/kamailio/commit/acdace7c846ce68a990a2b201d93caa… --- diff --git a/src/modules/app_ruby/README b/src/modules/app_ruby/README index 06040261b5..5b706bb915 100644 --- a/src/modules/app_ruby/README +++ b/src/modules/app_ruby/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2018 Daniel-Constantin Mierla (asipto.com) + Copyright Â© 2018 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ Table of Contents @@ -75,6 +75,11 @@ Chapter 1. Admin Guide access the currently processed SIP message. These functions are available within the Ruby module 'KSR'. + IMPORTANT: because of Ruby language policy (which require that a public + submodule name has to start with an uppercase leter), the KSR submodule + names are with all leters uppercase. For example, what is documented as + KSR.sl in KEMI docs, must be used as KSR::SL in Ruby scripts. + 2. Dependencies 2.1. Kamailio Modules @@ -103,7 +108,7 @@ Chapter 1. Admin Guide runtime. If you use it for KEMI configuration, then it has to include the requited functions. - Default value is "null". + Default value is ânullâ. Example 1.1. Set load parameter ... @@ -114,7 +119,7 @@ modparam("app_ruby", "load", "/usr/local/etc/kamailio/ruby/myscript.rb") 4.1. ruby_run(function, params) -4.1. ruby_run(function, params) +4.1. ruby_run(function, params) Execute the Ruby function 'func' giving params as parameters. There can be up to 3 string parameters. The function must exist in the script @@ -136,7 +141,7 @@ ruby_run("rb_funcx", "$rU", "2"); 5.1. app_ruby.reload 5.2. ruby_jsdt.api_list -5.1. app_ruby.reload +5.1. app_ruby.reload Marks the need to reload the js script. The actual reload is done by every working process when the next call to ruby_run() function or KEMI @@ -151,7 +156,7 @@ ruby_run("rb_funcx", "$rU", "2"); kamcmd app_ruby.reload ... -5.2. ruby_jsdt.api_list +5.2. ruby_jsdt.api_list List the functions available via Kemi framework. @@ -182,7 +187,7 @@ modparam("app_ruby", "load", "/usr/local/etc/kamailio/ruby/myscript.rb") ... request_route { ... - if(!jsdt_run("ksr_sl_reply")) { + if(!ruby_run("ksr_sl_reply")) { xdbg("SCRIPT: failed to execute ruby function!\n"); } ...

1 0

git:master:5e13f520: app_ruby: docs - added note about use of uppercases for KEMI KSR submodules
by Daniel-Constantin Mierla 30 May '18

30 May '18

Module: kamailio Branch: master Commit: 5e13f520a968f02224bf776268f1ebbceea8136f URL: https://github.com/kamailio/kamailio/commit/5e13f520a968f02224bf776268f1ebb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-30T18:26:00+02:00 app_ruby: docs - added note about use of uppercases for KEMI KSR submodules --- Modified: src/modules/app_ruby/doc/app_ruby_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e13f520a968f02224bf776268f1ebb… Patch: https://github.com/kamailio/kamailio/commit/5e13f520a968f02224bf776268f1ebb… --- diff --git a/src/modules/app_ruby/doc/app_ruby_admin.xml b/src/modules/app_ruby/doc/app_ruby_admin.xml index 44a26e9b6d..b6773785d1 100644 --- a/src/modules/app_ruby/doc/app_ruby_admin.xml +++ b/src/modules/app_ruby/doc/app_ruby_admin.xml @@ -12,9 +12,9 @@ <chapter> - <title>&adminguide;</title> + <title>&adminguide;</title> - <section> + <section> <title>Overview</title> <para> This module allows executing Ruby scripts from the Kamailio @@ -23,8 +23,14 @@ currently processed SIP message. These functions are available within the Ruby module 'KSR'. </para> - </section> - <section> + <para> + IMPORTANT: because of Ruby language policy (which require that a public + submodule name has to start with an uppercase leter), the KSR submodule + names are with all leters uppercase. For example, what is documented as + KSR.sl in KEMI docs, must be used as KSR::SL in Ruby scripts. + </para> + </section> + <section> <title>Dependencies</title> <section> <title>&kamailio; Modules</title> @@ -181,7 +187,7 @@ modparam("app_ruby", "load", "/usr/local/etc/kamailio/ruby/myscript.rb") ... request_route { ... - if(!jsdt_run("ksr_sl_reply")) { + if(!ruby_run("ksr_sl_reply")) { xdbg("SCRIPT: failed to execute ruby function!\n"); } ...

1 0

git:master:fdc55930: pkg/kamailio/deb: version 5.2.0~dev6
by Victor Seva 30 May '18

30 May '18

Module: kamailio Branch: master Commit: fdc559303df4de8b47b3802473f0613c2d8aef1d URL: https://github.com/kamailio/kamailio/commit/fdc559303df4de8b47b3802473f0613… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-05-30T18:19:28+02:00 pkg/kamailio/deb: version 5.2.0~dev6 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/fdc559303df4de8b47b3802473f0613… Patch: https://github.com/kamailio/kamailio/commit/fdc559303df4de8b47b3802473f0613…

1 0

git:master:7ff8d428: topos: skip handling local DMQ messages
by Daniel-Constantin Mierla 30 May '18

30 May '18

Module: kamailio Branch: master Commit: 7ff8d4284f20763e8e47f9b24e4604867a242e4a URL: https://github.com/kamailio/kamailio/commit/7ff8d4284f20763e8e47f9b24e46048… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-30T18:04:44+02:00 topos: skip handling local DMQ messages --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7ff8d4284f20763e8e47f9b24e46048… Patch: https://github.com/kamailio/kamailio/commit/7ff8d4284f20763e8e47f9b24e46048… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 558fd9853d..408c964e62 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -404,6 +404,10 @@ int tps_msg_sent(sr_event_param_t *evp) /* skip local out-of-dialog requests (e.g., keepalive) */ goto done; } + if(get_cseq(&msg)->method.len==4 + && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)) { + goto done; + } } tps_request_sent(&msg, dialog, local);

1 0

git:master:18d8d1e2: Makefile.defs: version set to 5.2.0-dev6
by Daniel-Constantin Mierla 30 May '18

30 May '18

Module: kamailio Branch: master Commit: 18d8d1e28b1065bd3a367b04324fcec882a12125 URL: https://github.com/kamailio/kamailio/commit/18d8d1e28b1065bd3a367b04324fcec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-30T17:48:30+02:00 Makefile.defs: version set to 5.2.0-dev6 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/18d8d1e28b1065bd3a367b04324fcec… Patch: https://github.com/kamailio/kamailio/commit/18d8d1e28b1065bd3a367b04324fcec… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index a470e0ce7b..428a23674a 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev5 +EXTRAVERSION = -dev6 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:1473e85d: app_ruby: try to detect ruby lib version
by Daniel-Constantin Mierla 30 May '18

30 May '18

Module: kamailio Branch: master Commit: 1473e85da090083caa8ca880855b3ce948f147de URL: https://github.com/kamailio/kamailio/commit/1473e85da090083caa8ca880855b3ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-30T17:48:30+02:00 app_ruby: try to detect ruby lib version --- Modified: src/modules/app_ruby/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/1473e85da090083caa8ca880855b3ce… Patch: https://github.com/kamailio/kamailio/commit/1473e85da090083caa8ca880855b3ce… --- diff --git a/src/modules/app_ruby/Makefile b/src/modules/app_ruby/Makefile index d3cb339ed9..341dc4fb75 100644 --- a/src/modules/app_ruby/Makefile +++ b/src/modules/app_ruby/Makefile @@ -7,8 +7,10 @@ include ../../Makefile.defs auto_gen= NAME=app_ruby.so -RUBYVER=ruby-2.5 - +RUBYVER=$(shell pkg-config --list-all | grep ruby-2 | tail -1 | cut -f 1 -d " ") +ifeq ($(RUBYVER),) +RUBYVER=ruby-2.3 +endif ifeq ($(CROSS_COMPILE),) BUILDER = $(shell which pkg-config) ifneq ($(BUILDER),)

1 0

git:master:3fbb0af0: Makefile.groups: added group for app_ruby module
by Daniel-Constantin Mierla 30 May '18

30 May '18

Module: kamailio Branch: master Commit: 3fbb0af0c4b3d17efe5cd2f7b44f7100f3393bba URL: https://github.com/kamailio/kamailio/commit/3fbb0af0c4b3d17efe5cd2f7b44f710… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-30T17:48:30+02:00 Makefile.groups: added group for app_ruby module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/3fbb0af0c4b3d17efe5cd2f7b44f710… Patch: https://github.com/kamailio/kamailio/commit/3fbb0af0c4b3d17efe5cd2f7b44f710… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 0ee75fe3e6..8274291b74 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -128,6 +128,9 @@ mod_list_python3=app_python3 # - modules depending on libm (math library - standard system library) mod_list_jsdt=app_jsdt +# - modules depending on ruby library +mod_list_ruby=app_ruby + # - modules depending on geoip library mod_list_geoip=geoip @@ -217,7 +220,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_websocket) \ $(mod_list_snmpstats) $(mod_list_presence) \ $(mod_list_lua) $(mod_list_python) \ - $(mod_list_python3) \ + $(mod_list_python3) $(mod_list_ruby) \ $(mod_list_geoip) $(mod_list_sqlite) \ $(mod_list_json) $(mod_list_json_event) \ $(mod_list_redis) \ @@ -367,6 +370,9 @@ module_group_kpython=$(mod_list_python) # pkg python3 module module_group_kpython3=$(mod_list_python3) +# pkg ruby module +module_group_kruby=$(mod_list_ruby) + # pkg geoip module module_group_kgeoip=$(mod_list_geoip)

1 0

git:master:88b8ef1e: app_ruby: initial import of embedded ruby interpreter module
by Daniel-Constantin Mierla 30 May '18

30 May '18

Module: kamailio Branch: master Commit: 88b8ef1ec2e3affed2e4d362a5f352879f40dd14 URL: https://github.com/kamailio/kamailio/commit/88b8ef1ec2e3affed2e4d362a5f3528… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-30T17:48:30+02:00 app_ruby: initial import of embedded ruby interpreter module - allow execution of ruby scripts using kemi exports --- Added: src/modules/app_ruby/Makefile Added: src/modules/app_ruby/README Added: src/modules/app_ruby/app_ruby_api.c Added: src/modules/app_ruby/app_ruby_api.h Added: src/modules/app_ruby/app_ruby_kemi_export.c Added: src/modules/app_ruby/app_ruby_kemi_export.h Added: src/modules/app_ruby/app_ruby_mod.c Added: src/modules/app_ruby/doc/Makefile Added: src/modules/app_ruby/doc/app_ruby.xml Added: src/modules/app_ruby/doc/app_ruby_admin.xml Added: src/modules/app_ruby/utils/app_ruby_ctl --- Diff: https://github.com/kamailio/kamailio/commit/88b8ef1ec2e3affed2e4d362a5f3528… Patch: https://github.com/kamailio/kamailio/commit/88b8ef1ec2e3affed2e4d362a5f3528…

1 0

git:master:f1cb1095: pkg/kamailio/deb: add support for Ubuntu bionic
by Victor Seva 30 May '18

30 May '18

Module: kamailio Branch: master Commit: f1cb109531bec2039cc9fab5a6314ce357225111 URL: https://github.com/kamailio/kamailio/commit/f1cb109531bec2039cc9fab5a6314ce… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-05-30T13:41:52+02:00 pkg/kamailio/deb: add support for Ubuntu bionic --- Added: pkg/kamailio/deb/bionic/changelog Added: pkg/kamailio/deb/bionic/compat Added: pkg/kamailio/deb/bionic/control Added: pkg/kamailio/deb/bionic/copyright Added: pkg/kamailio/deb/bionic/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/bionic/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio.README.Debian Added: pkg/kamailio/deb/bionic/kamailio.default Added: pkg/kamailio/deb/bionic/kamailio.examples Added: pkg/kamailio/deb/bionic/kamailio.init Added: pkg/kamailio/deb/bionic/kamailio.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio.postinst Added: pkg/kamailio/deb/bionic/kamailio.service Added: pkg/kamailio/deb/bionic/rules Added: pkg/kamailio/deb/bionic/source.lintian-overrides Added: pkg/kamailio/deb/bionic/source/format Added: pkg/kamailio/deb/bionic/watch Added: pkg/kamailio/deb/debian/backports/bionic --- Diff: https://github.com/kamailio/kamailio/commit/f1cb109531bec2039cc9fab5a6314ce… Patch: https://github.com/kamailio/kamailio/commit/f1cb109531bec2039cc9fab5a6314ce…

1 0

git:master:be82892a: db_cluster remove old svn ID tags
by Olle E. Johansson 30 May '18

30 May '18

Module: kamailio Branch: master Commit: be82892a68342287d37de90ddb74c1f66a37e28f URL: https://github.com/kamailio/kamailio/commit/be82892a68342287d37de90ddb74c1f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2018-05-30T12:48:26+02:00 db_cluster remove old svn ID tags --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_api.h Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h --- Diff: https://github.com/kamailio/kamailio/commit/be82892a68342287d37de90ddb74c1f… Patch: https://github.com/kamailio/kamailio/commit/be82892a68342287d37de90ddb74c1f… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index e7ebcddc15..3e0eb06801 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Generic db cluster module interface * * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com) diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index 6ef6ec4db0..111abcca20 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * DB CLuster core functions * * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com) diff --git a/src/modules/db_cluster/dbcl_api.h b/src/modules/db_cluster/dbcl_api.h index ff581aa25d..ad95e81044 100644 --- a/src/modules/db_cluster/dbcl_api.h +++ b/src/modules/db_cluster/dbcl_api.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * DB CLuster core functions * * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com) diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index 66c3d30e24..c765172442 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * DB CLuster core functions * * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com) diff --git a/src/modules/db_cluster/dbcl_data.h b/src/modules/db_cluster/dbcl_data.h index b745e42ff2..1c17c074eb 100644 --- a/src/modules/db_cluster/dbcl_data.h +++ b/src/modules/db_cluster/dbcl_data.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * DB CLuster core functions * * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com)

1 0

git:master:f854f2c2: core: kemi - more log-level message shortcut functions
by Daniel-Constantin Mierla 29 May '18

29 May '18

Module: kamailio Branch: master Commit: f854f2c27bee1b1e4f43565ff1865b88c27387c9 URL: https://github.com/kamailio/kamailio/commit/f854f2c27bee1b1e4f43565ff1865b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-29T22:49:42+02:00 core: kemi - more log-level message shortcut functions --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/f854f2c27bee1b1e4f43565ff1865b8… Patch: https://github.com/kamailio/kamailio/commit/f854f2c27bee1b1e4f43565ff1865b8… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 5a07abb254..ac31b1beb0 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -98,6 +98,36 @@ static int sr_kemi_core_info(sip_msg_t *msg, str *txt) return 0; } +/** + * + */ +static int sr_kemi_core_warn(sip_msg_t *msg, str *txt) +{ + if(txt!=NULL && txt->s!=NULL) + LM_WARN("%.*s", txt->len, txt->s); + return 0; +} + +/** + * + */ +static int sr_kemi_core_notice(sip_msg_t *msg, str *txt) +{ + if(txt!=NULL && txt->s!=NULL) + LM_NOTICE("%.*s", txt->len, txt->s); + return 0; +} + +/** + * + */ +static int sr_kemi_core_crit(sip_msg_t *msg, str *txt) +{ + if(txt!=NULL && txt->s!=NULL) + LM_CRIT("%.*s", txt->len, txt->s); + return 0; +} + /** * */ @@ -1157,6 +1187,21 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("warn"), + SR_KEMIP_NONE, sr_kemi_core_warn, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("notice"), + SR_KEMIP_NONE, sr_kemi_core_notice, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("crit"), + SR_KEMIP_NONE, sr_kemi_core_crit, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("log"), SR_KEMIP_NONE, sr_kemi_core_log, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] JSONRPCS replacing keys in params gives unexpected behaivor (#1550)
by ovoshlook 29 May '18

29 May '18

Hi Using kamailio with http jsonrpcs found next trouble When i making request like curl -s -H 'Content-Type: application/json' --data-binary '{"method":"htable.get","params":{**"name":"mytable"**,"key":"myparam"},"jsonrpc":"2.0"}' http://127.0.0.1:5060/jsonrpc all fine. I getting good response But when I making curl -s -H 'Content-Type: application/json' --data-binary '{"method":"htable.get","params":{"key":"myparam",**"name":"mytable"**},"jsonrpc":"2.0"}' http://127.0.0.1:5060/jsonrpc i.e keys of object on different places It gives me curl -s -H 'Content-Type: application/json' --data-binary '{"jsonrpc":"2.0", "method": "htable.get","params":{"key":"mykey","name": "mytable"}}' http://127.0.0.1:5060/jsonrpc { "jsonrpc": "2.0", "error": { "code": 500, "message": "No such htable" } } Means kamailio cant find needed htable I supposed that position of the key should't have a matter for the JSON objects parsers But here is looks like different May be it is not a bug bug feature request because of it is just an unexpected behaivor Im using kamailio 5.1.3 on the Debian 9 version: kamailio 5.1.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 00:25:48 May 9 2018 with gcc 6.3.0 -- 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/1550

2 2

git:master:616b6890: app_jsdt: exported KSR.pv.getw(...)
by Daniel-Constantin Mierla 29 May '18

29 May '18

Module: kamailio Branch: master Commit: 616b68904e0741ebcdb70e3c7f66b3b6d1254a8d URL: https://github.com/kamailio/kamailio/commit/616b68904e0741ebcdb70e3c7f66b3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-29T13:39:04+02:00 app_jsdt: exported KSR.pv.getw(...) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/616b68904e0741ebcdb70e3c7f66b3b… Patch: https://github.com/kamailio/kamailio/commit/616b68904e0741ebcdb70e3c7f66b3b… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 1b6dba4145..108b96896c 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -424,6 +424,7 @@ static int jsdt_sr_pv_is_null (duk_context *J) const duk_function_list_entry _sr_kemi_pv_J_Map[] = { { "get", jsdt_sr_pv_get, 1 /* 1 args */ }, + { "getw", jsdt_sr_pv_getw, 1 /* 1 args */ }, { "seti", jsdt_sr_pv_seti, 2 /* 2 args */ }, { "sets", jsdt_sr_pv_sets, 2 /* 2 args */ }, { "unset", jsdt_sr_pv_unset, 1 /* 1 args */ },

1 0

git:master:7e08fc8d: stun: catch udp ping 0000 when trying to parse stun headers
by Daniel-Constantin Mierla 29 May '18

29 May '18

Module: kamailio Branch: master Commit: 7e08fc8d2b74657d6e6171effbab2770482d693e URL: https://github.com/kamailio/kamailio/commit/7e08fc8d2b74657d6e6171effbab277… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-29T13:29:36+02:00 stun: catch udp ping 0000 when trying to parse stun headers - avoid useless debug message - info message made debug if the size of received packet is too small for a stun header --- Modified: src/modules/stun/kam_stun.c --- Diff: https://github.com/kamailio/kamailio/commit/7e08fc8d2b74657d6e6171effbab277… Patch: https://github.com/kamailio/kamailio/commit/7e08fc8d2b74657d6e6171effbab277… --- diff --git a/src/modules/stun/kam_stun.c b/src/modules/stun/kam_stun.c index 350317b0e7..62bd368589 100644 --- a/src/modules/stun/kam_stun.c +++ b/src/modules/stun/kam_stun.c @@ -165,8 +165,12 @@ static int stun_parse_header(struct stun_msg* req, USHORT_T* error_code) { if (sizeof(req->hdr) > req->msg.buf.len) { + if(req->msg.buf.len==4 && *((int*)req->msg.buf.s)==0) { + /* likely the UDP ping 0000 */ + return FATAL_ERROR; + } /* the received message does not contain whole header */ - LOG(L_INFO, "INFO: stun_parse_header: incomplete header of STUN message\n"); + LM_DBG("incomplete header of STUN message\n"); /* Any better solution? IMHO it's not possible to send error response * because the transaction ID is not available. */

1 0

[kamailio/kamailio] srdb1: connection string to mongodb too long (#1545)
by Konstantin 28 May '18

28 May '18

### Description We need to connect to a cluster of mongodb hosts with some specific parameters. The connection string has length more than 255 characters. We could not connect to our mongodb. ### Troubleshooting #### Reproduction Use very long string for example like bellow mongo0-pdb-demo.somedomain.com:27017,mongo1-pdb-demo.somedomain.com:27017,mongo2-pdb-demo.somedomain.com:27017/proxy-db-ft1?replicaSet=rs0&ssl=true&sslClientCertificateKeyFile=/etc/ssl/domain1234.pem&sslCertificateAuthorityFile=/etc/ssl/godaddy.pem #### Log Messages We got errors: ERROR: <core> [db.c:168]: db_bind_mod(): SQL URL too long ERROR: auth_db [auth_db_mod.c:173]: mod_init(): unable to bind to a database driver ### Additional Information version: kamailio 4.4.7 (x86_64/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/1545

2 2

git:master:0a9ebbbd: lib/srdb1: increased the safety check for max db url to 1023
by Daniel-Constantin Mierla 28 May '18

28 May '18

Module: kamailio Branch: master Commit: 0a9ebbbdfe0cd4c137338adbacf5c5890222708a URL: https://github.com/kamailio/kamailio/commit/0a9ebbbdfe0cd4c137338adbacf5c58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-28T15:34:29+02:00 lib/srdb1: increased the safety check for max db url to 1023 - was 255, too small for large connection strings needed for no-sql - reported by GH #1545 --- Modified: src/lib/srdb1/db.c --- Diff: https://github.com/kamailio/kamailio/commit/0a9ebbbdfe0cd4c137338adbacf5c58… Patch: https://github.com/kamailio/kamailio/commit/0a9ebbbdfe0cd4c137338adbacf5c58… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index c3908af85d..305543c931 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -60,7 +60,7 @@ #include "db_query.h" #include "db.h" -static unsigned int MAX_URL_LENGTH = 255; /*!< maximum length of a SQL URL */ +static unsigned int MAX_URL_LENGTH = 1023; /*!< maximum length of a SQL URL */ int db_check_api(db_func_t* dbf, char *mname)

1 0

git:master:80e99881: modules: readme files regenerated - lcr ... [skip ci]
by Kamailio Dev 28 May '18

28 May '18

Module: kamailio Branch: master Commit: 80e9988170ff678e26c916c18211f76884c02c0e URL: https://github.com/kamailio/kamailio/commit/80e9988170ff678e26c916c18211f76… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-28T08:01:55+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/80e9988170ff678e26c916c18211f76… Patch: https://github.com/kamailio/kamailio/commit/80e9988170ff678e26c916c18211f76…

1 0

git:master:1d1047b8: Merge pull request #1546 from cruzccl/lcr-rule_id-avp
by GitHub 28 May '18

28 May '18

Module: kamailio Branch: master Commit: 1d1047b8da930d5091704c25197df1b289d13b85 URL: https://github.com/kamailio/kamailio/commit/1d1047b8da930d5091704c25197df1b… Author: juha-h <jh(a)tutpro.com> Committer: GitHub <noreply(a)github.com> Date: 2018-05-28T08:47:14+03:00 Merge pull request #1546 from cruzccl/lcr-rule_id-avp lcr: export rule_id_avp with matching rule id --- Modified: src/modules/lcr/doc/lcr_admin.xml Modified: src/modules/lcr/lcr_mod.c Modified: src/modules/lcr/lcr_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/1d1047b8da930d5091704c25197df1b… Patch: https://github.com/kamailio/kamailio/commit/1d1047b8da930d5091704c25197df1b…

1 0

git:master:7e97e877: lcr: export rule_id_avp with matching rule id
by Carlos Cruz 28 May '18

28 May '18

Module: kamailio Branch: master Commit: 7e97e87738f15017c732f74230c79c77cffca60f URL: https://github.com/kamailio/kamailio/commit/7e97e87738f15017c732f74230c79c7… Author: Carlos Cruz <carlos(a)irontec.com> Committer: Carlos Cruz <carlos(a)irontec.com> Date: 2018-05-27T21:59:21+02:00 lcr: export rule_id_avp with matching rule id --- Modified: src/modules/lcr/doc/lcr_admin.xml Modified: src/modules/lcr/lcr_mod.c Modified: src/modules/lcr/lcr_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/7e97e87738f15017c732f74230c79c7… Patch: https://github.com/kamailio/kamailio/commit/7e97e87738f15017c732f74230c79c7…

1 0

[kamailio/kamailio] lcr: export rule_id_avp with matching rule id (#1546)
by Carlos Cruz Luengo 28 May '18

28 May '18

#### 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 - [ ] 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 LCR module exports information about selected gateways in flags and tag AVPs if you define corresponding modparams (flags_avp and tag_avp). This PR exports a similar optional AVP that stores the id of the rule that selected each gateway. For that, a new modparam is added (rule_id_avp). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1546 -- Commit Summary -- * lcr: export rule_id_avp with matching rule id -- File Changes -- M src/modules/lcr/doc/lcr_admin.xml (34) M src/modules/lcr/lcr_mod.c (62) M src/modules/lcr/lcr_mod.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1546.patch https://github.com/kamailio/kamailio/pull/1546.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/1546

3 3

Re: [sr-dev] [SR-Users] Developer Guide
by Henning Westerholt 27 May '18

27 May '18

Am Sonntag, 27. Mai 2018, 15:17:23 CEST schrieb Igor Olhovskiy: > Is http://www.asipto.com/pub/kamailio-devel-guide/ still holds actual info? > Cause it’s mostly for 3.3 version, and now is 5.1 > > And where to read, except source code of course, about how to develop > modules for Kamailio? (adding sr-dev as CC, as its a development question) Hello Igor, I would say that most of the core concepts (architecture, memory management, pseudo- variables etc..) are still valid. In my opinion the value of such a guide is not that it provides up to date information e.g. to the specific layout of header files, but instead gives an overview about the concepts and provide pointer to the appropriate parts of development. About the module development question - you probably already saw the chapter 16.9 about module development in this guide. This is a good start. Then look to some more simple modules like cfgutils or siputils to learn how to interact exactly with the core, the cfg, SIP msg etc.. For a new database module the db_mysql module is a good starting point. If you have more specific question, just ask them on our developer list sr-dev. Best regards, Henning

2 1

git:master:93932a4f: rls: allocate size for normalized uri for cloning buffer
by Daniel-Constantin Mierla 27 May '18

27 May '18

Module: kamailio Branch: master Commit: 93932a4ff18760d8fc8c59bd08984fd00cfd7759 URL: https://github.com/kamailio/kamailio/commit/93932a4ff18760d8fc8c59bd08984fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-27T10:56:00+02:00 rls: allocate size for normalized uri for cloning buffer - it can be longer than pres uri, when proto prefix needs to be added --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/93932a4ff18760d8fc8c59bd08984fd… Patch: https://github.com/kamailio/kamailio/commit/93932a4ff18760d8fc8c59bd08984fd… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index a96d1674f7..3d71e7e3f3 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -978,6 +978,8 @@ int send_resource_subs(char* uri, void* param) pres_uri.len, pres_uri.s); return -1; } + LM_DBG("pres uri [%.*s] - normalized uri [%.*s]\n", + pres_uri.len, pres_uri.s, normalized_uri->len, normalized_uri->s); if (parse_uri(normalized_uri->s, normalized_uri->len, &parsed_pres_uri) < 0) { @@ -1009,7 +1011,8 @@ int send_resource_subs(char* uri, void* param) LM_ERR("out of private memory\n"); return -1; } - if ((tmp_str->s = (char *)pkg_malloc(sizeof(char) * pres_uri.len)) == NULL) + if ((tmp_str->s = (char *)pkg_malloc(sizeof(char) + * normalized_uri->len)) == NULL) { pkg_free(tmp_str); LM_ERR("out of private memory\n");

1 0

Re: [sr-dev] [kamailio/kamailio] topos_redis: proper length value when comparing to insert INVITE branch (2a3ca59)
by dtryba 25 May '18

25 May '18

This patch fixes the issue with PRACK and TOPOS reported in https://lists.kamailio.org/pipermail/sr-users/2018-May/101327.html -- 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/commit/2a3ca5942291d29de05b14338a36cec…

1 0

kamailio.org server maintenance work
by Oriol Capsada 25 May '18

25 May '18

Hello, A kamailio.org server maintenance work will be done today at 18:00 CEST. There will be some minutes of downtime (should be less than 5') of the following main services: website (including the wiki) and mailing lists. Regards, Oriol.

1 0

[kamailio/kamailio] KSR.xhttp.xhttp_reply code cant understand type (#1544)
by ovoshlook 25 May '18

25 May '18

Hi. I'm building small HTTP API using kemi lua on kamailio 5.1 version: kamailio -v version: kamailio 5.1.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 18:16:53 Apr 7 2018 with gcc 4.8.5 On the system Linux CentOS-74-64-minimal 3.10.0-693.17.1.el7.x86_64 #1 SMP Thu Jan 25 20:13:58 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux When i sending xhttp_reply I getting wrong code that kamailio sends to the client instead of code I use Im used as this exmaple as template int xhttp_reply(int code, str "reason", str "ctype", str "body") as classic (with code in string) `KSR.xhttp.xhttp_reply("200", "OK", application/json, "")` So in both cases I getting next trouble: When i trying to set params to the xhttp_reply i getting this in the log (on debug layer) DEBUG: app_lua [app_lua_sr.c:1500]: sr_kemi_lua_exec_func_ex(): param[0] for: xhttp_reply is int: 200 DEBUG: app_lua [app_lua_sr.c:1496]: sr_kemi_lua_exec_func_ex(): param[1] for: xhttp_reply is str: OK DEBUG: app_lua [app_lua_sr.c:1496]: sr_kemi_lua_exec_func_ex(): param[2] for: xhttp_reply is str: application/json but next string I shows DEBUG: xhttp [xhttp_mod.c:443]: xhttp_send_reply(): sending out response: 161110576 OK This first 3 digits at the reslonse I see **161** 110576 Digits are random, as positive as negative (with "-" at the start) -- 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/1544

2 6

git:master:b035558e: app_python3: fix for executing kemi functions with 4 or more params
by Daniel-Constantin Mierla 25 May '18

25 May '18

Module: kamailio Branch: master Commit: b035558ec76a68ee17b612adb9dce116ed89c48c URL: https://github.com/kamailio/kamailio/commit/b035558ec76a68ee17b612adb9dce11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T12:09:32+02:00 app_python3: fix for executing kemi functions with 4 or more params - more combinations for 4 params --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b035558ec76a68ee17b612adb9dce11… Patch: https://github.com/kamailio/kamailio/commit/b035558ec76a68ee17b612adb9dce11… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index cacd9067f4..fc0368822b 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -563,21 +563,37 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 4: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { /* ssss */ ret = ((sr_kemi_fmssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_apy_return_int(ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + /* ssnn */ + ret = ((sr_kemi_fmsssn_f)(ket->func))(lmsg, + &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { /* ssnn */ ret = ((sr_kemi_fmssnn_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + /* ssnn */ + ret = ((sr_kemi_fmnsss_f)(ket->func))(lmsg, + vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname.len, fname.s); @@ -586,10 +602,10 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 5: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { /* sssss */ ret = ((sr_kemi_fmsssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, @@ -603,11 +619,11 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 6: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { /* ssssss */ ret = ((sr_kemi_fmssssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s,

1 0

git:master:d86b67bb: app_sqlang: fix for executing kemi functions with 4 or more params
by Daniel-Constantin Mierla 25 May '18

25 May '18

Module: kamailio Branch: master Commit: d86b67bbde300e4aa1be7ea7c5bdb21469ece03c URL: https://github.com/kamailio/kamailio/commit/d86b67bbde300e4aa1be7ea7c5bdb21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T12:01:00+02:00 app_sqlang: fix for executing kemi functions with 4 or more params - more combinations for 4 params --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/d86b67bbde300e4aa1be7ea7c5bdb21… Patch: https://github.com/kamailio/kamailio/commit/d86b67bbde300e4aa1be7ea7c5bdb21… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 77d98ddc3d..27f4ac2f36 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -1330,19 +1330,33 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) break; case 4: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_sqlang_return_int(J, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmsssn_f)(ket->func))(env_J->msg, + &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_sqlang_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { ret = ((sr_kemi_fmssnn_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_sqlang_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnsss_f)(ket->func))(env_J->msg, + vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); + return sr_kemi_sqlang_return_int(J, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1351,10 +1365,10 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) break; case 5: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { ret = ((sr_kemi_fmsssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s); @@ -1367,11 +1381,11 @@ int sr_kemi_sqlang_exec_func_ex(HSQUIRRELVM J, sr_kemi_t *ket) break; case 6: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s, &vps[5].s);

1 0

git:master:551e4d37: app_python: fix for executing kemi functions with 4 or more params
by Daniel-Constantin Mierla 25 May '18

25 May '18

Module: kamailio Branch: master Commit: 551e4d372892d1d5c7803c3812d0bd4613efaf36 URL: https://github.com/kamailio/kamailio/commit/551e4d372892d1d5c7803c3812d0bd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T11:57:15+02:00 app_python: fix for executing kemi functions with 4 or more params - more combinations for 4 params --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/551e4d372892d1d5c7803c3812d0bd4… Patch: https://github.com/kamailio/kamailio/commit/551e4d372892d1d5c7803c3812d0bd4… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 6ea72e3d1c..6a1d62d932 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -560,21 +560,37 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 4: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { /* ssss */ ret = ((sr_kemi_fmssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_apy_return_int(ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + /* ssnn */ + ret = ((sr_kemi_fmsssn_f)(ket->func))(lmsg, + &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { /* ssnn */ ret = ((sr_kemi_fmssnn_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_apy_return_int(ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + /* ssnn */ + ret = ((sr_kemi_fmnsss_f)(ket->func))(lmsg, + vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); + return sr_kemi_apy_return_int(ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname.len, fname.s); @@ -583,10 +599,10 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 5: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { /* sssss */ ret = ((sr_kemi_fmsssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, @@ -600,11 +616,11 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) break; case 6: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { /* ssssss */ ret = ((sr_kemi_fmssssss_f)(ket->func))(lmsg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s,

1 0

git:master:81d517f0: app_jsdt: fix for executing kemi functions with 4 or more params
by Daniel-Constantin Mierla 25 May '18

25 May '18

Module: kamailio Branch: master Commit: 81d517f0a3dcd769dc84ff019c58e248ef7eb466 URL: https://github.com/kamailio/kamailio/commit/81d517f0a3dcd769dc84ff019c58e24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T11:49:25+02:00 app_jsdt: fix for executing kemi functions with 4 or more params - more combinations for 4 params --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/81d517f0a3dcd769dc84ff019c58e24… Patch: https://github.com/kamailio/kamailio/commit/81d517f0a3dcd769dc84ff019c58e24… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index ef86d51165..1b6dba4145 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1120,19 +1120,33 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) break; case 4: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_jsdt_return_int(J, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmsssn_f)(ket->func))(env_J->msg, + &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { ret = ((sr_kemi_fmssnn_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_jsdt_return_int(J, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnsss_f)(ket->func))(env_J->msg, + vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); + return sr_kemi_jsdt_return_int(J, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1141,10 +1155,10 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) break; case 5: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { ret = ((sr_kemi_fmsssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s); @@ -1157,11 +1171,11 @@ int sr_kemi_jsdt_exec_func_ex(duk_context *J, sr_kemi_t *ket) break; case 6: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssssss_f)(ket->func))(env_J->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s, &vps[5].s);

1 0

git:master:52f246fb: app_lua: fix for running kemi functions with 4 or more parameters
by Daniel-Constantin Mierla 25 May '18

25 May '18

Module: kamailio Branch: master Commit: 52f246fbcc9097f77b6a64d15a4ff74e03577ba8 URL: https://github.com/kamailio/kamailio/commit/52f246fbcc9097f77b6a64d15a4ff74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T11:42:45+02:00 app_lua: fix for running kemi functions with 4 or more parameters - added new combinations for 4 params case - reported by GH #1544 --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/52f246fbcc9097f77b6a64d15a4ff74… Patch: https://github.com/kamailio/kamailio/commit/52f246fbcc9097f77b6a64d15a4ff74… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 6edba5d7a7..c98830da5c 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1682,19 +1682,33 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) break; case 4: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssss_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s); return sr_kemi_lua_return_int(L, ket, ret); } else if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_INT - || ket->ptypes[3]==SR_KEMIP_INT) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_INT) { + ret = ((sr_kemi_fmsssn_f)(ket->func))(env_L->msg, + &vps[0].s, &vps[1].s, &vps[2].s, vps[3].n); + return sr_kemi_lua_return_int(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_STR + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_INT + && ket->ptypes[3]==SR_KEMIP_INT) { ret = ((sr_kemi_fmssnn_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, vps[2].n, vps[3].n); return sr_kemi_lua_return_int(L, ket, ret); + } else if(ket->ptypes[0]==SR_KEMIP_INT + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR) { + ret = ((sr_kemi_fmnsss_f)(ket->func))(env_L->msg, + vps[0].n, &vps[1].s, &vps[2].s, &vps[3].s); + return sr_kemi_lua_return_int(L, ket, ret); } else { LM_ERR("invalid parameters for: %.*s\n", fname->len, fname->s); @@ -1703,10 +1717,10 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) break; case 5: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR) { ret = ((sr_kemi_fmsssss_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s); @@ -1719,11 +1733,11 @@ int sr_kemi_lua_exec_func_ex(lua_State* L, sr_kemi_t *ket, int pdelta) break; case 6: if(ket->ptypes[0]==SR_KEMIP_STR - || ket->ptypes[1]==SR_KEMIP_STR - || ket->ptypes[2]==SR_KEMIP_STR - || ket->ptypes[3]==SR_KEMIP_STR - || ket->ptypes[4]==SR_KEMIP_STR - || ket->ptypes[5]==SR_KEMIP_STR) { + && ket->ptypes[1]==SR_KEMIP_STR + && ket->ptypes[2]==SR_KEMIP_STR + && ket->ptypes[3]==SR_KEMIP_STR + && ket->ptypes[4]==SR_KEMIP_STR + && ket->ptypes[5]==SR_KEMIP_STR) { ret = ((sr_kemi_fmssssss_f)(ket->func))(env_L->msg, &vps[0].s, &vps[1].s, &vps[2].s, &vps[3].s, &vps[4].s, &vps[5].s);

1 0

git:master:6528c9cb: core: kemi - more combinations for function prototypes
by Daniel-Constantin Mierla 25 May '18

25 May '18

Module: kamailio Branch: master Commit: 6528c9cbc5a89128d4892f1a526c76747b42448c URL: https://github.com/kamailio/kamailio/commit/6528c9cbc5a89128d4892f1a526c767… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-25T11:42:45+02:00 core: kemi - more combinations for function prototypes --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/6528c9cbc5a89128d4892f1a526c767… Patch: https://github.com/kamailio/kamailio/commit/6528c9cbc5a89128d4892f1a526c767… --- diff --git a/src/core/kemi.h b/src/core/kemi.h index d19e094c63..0822c752f4 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -89,8 +89,22 @@ typedef int (*sr_kemi_fmssn_f)(sip_msg_t*, str*, str*, int); typedef int (*sr_kemi_fmsss_f)(sip_msg_t*, str*, str*, str*); /* sip_msg_t and four int|str params */ -typedef int (*sr_kemi_fmssss_f)(sip_msg_t*, str*, str*, str*, str*); +typedef int (*sr_kemi_fmnnnn_f)(sip_msg_t*, int, int, int, int); +typedef int (*sr_kemi_fmnnns_f)(sip_msg_t*, int, int, int, str*); +typedef int (*sr_kemi_fmnnsn_f)(sip_msg_t*, int, int, str*, int); +typedef int (*sr_kemi_fmnnss_f)(sip_msg_t*, int, int, str*, str*); +typedef int (*sr_kemi_fmnsnn_f)(sip_msg_t*, int, str*, int, int); +typedef int (*sr_kemi_fmnsns_f)(sip_msg_t*, int, str*, int, str*); +typedef int (*sr_kemi_fmnssn_f)(sip_msg_t*, int, str*, str*, int); +typedef int (*sr_kemi_fmnsss_f)(sip_msg_t*, int, str*, str*, str*); +typedef int (*sr_kemi_fmsnnn_f)(sip_msg_t*, str*, int, int, int); +typedef int (*sr_kemi_fmsnns_f)(sip_msg_t*, str*, int, int, str*); +typedef int (*sr_kemi_fmsnsn_f)(sip_msg_t*, str*, int, str*, int); +typedef int (*sr_kemi_fmsnss_f)(sip_msg_t*, str*, int, str*, str*); typedef int (*sr_kemi_fmssnn_f)(sip_msg_t*, str*, str*, int, int); +typedef int (*sr_kemi_fmssns_f)(sip_msg_t*, str*, str*, int, str*); +typedef int (*sr_kemi_fmsssn_f)(sip_msg_t*, str*, str*, str*, int); +typedef int (*sr_kemi_fmssss_f)(sip_msg_t*, str*, str*, str*, str*); /* sip_msg_t and five int|str params */ typedef int (*sr_kemi_fmsssss_f)(sip_msg_t*, str*, str*, str*, str*, str*);

1 0

[kamailio/kamailio] Bugfix trash expires (#1539)
by Christoph VALENTIN 24 May '18

24 May '18

#### 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 against Version 5.1.0 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When old (maybe forgotten) Contacts expire in S-CSCF, then current - wanted - calls will be deleted, which is not wanted. Reason is the usage of "=" Operator instead "==" Operator in ims_usrloc_scscf module. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1539 -- Commit Summary -- * ims_usrloc_scscf: bugfix Contct is removed when old Contct expires * removed KCCVICT tagging * Merge branch 'bugfix_prm18_0000756_trash_expires' into bugfix_trash_expires -- File Changes -- M src/modules/ims_usrloc_scscf/impurecord.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1539.patch https://github.com/kamailio/kamailio/pull/1539.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/1539

5 6

git:master:c2fd44b6: Merge pull request #1539 from christoph-v/bugfix_trash_expires
by GitHub 24 May '18

24 May '18

Module: kamailio Branch: master Commit: c2fd44b6101116dd6bfb4c14ef81ea87e5af6f6e URL: https://github.com/kamailio/kamailio/commit/c2fd44b6101116dd6bfb4c14ef81ea8… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2018-05-24T10:30:22+02:00 Merge pull request #1539 from christoph-v/bugfix_trash_expires Bugfix trash expires --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/c2fd44b6101116dd6bfb4c14ef81ea8… Patch: https://github.com/kamailio/kamailio/commit/c2fd44b6101116dd6bfb4c14ef81ea8… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 9cee5bc765..6510d85aa1 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -1239,7 +1239,7 @@ int unlink_contact_from_impu(impurecord_t* impu, ucontact_t* contact, int write_ impucontact = impu->linked_contacts.head; while (impucontact) { - if ((contact = impucontact->contact)) { + if ((contact == impucontact->contact)) { remove_impucontact_from_list(impu, impucontact); if (write_to_db && db_mode == WRITE_THROUGH && (db_unlink_contact_from_impu(impu, contact) != 0)) { LM_ERR("Failed to un-link DB contact [%.*s] from IMPU [%.*s]...continuing but db will be out of sync!\n", contact->c.len, contact->c.s, impu->public_identity.len, impu->public_identity.s);

1 0

git:master:2b1e895e: ims_usrloc_scscf: bugfix Contct is removed when old Contct expires
by Christoph Valentin 24 May '18

24 May '18

Module: kamailio Branch: master Commit: 2b1e895e1a319b932a449c703a974c6ab8aafc6e URL: https://github.com/kamailio/kamailio/commit/2b1e895e1a319b932a449c703a974c6… Author: Christoph Valentin <christoph.valentin(a)kapsch.net> Committer: Christoph Valentin <christoph.valentin(a)kapsch.net> Date: 2018-05-22T17:12:10+02:00 ims_usrloc_scscf: bugfix Contct is removed when old Contct expires in function unlink_contact_from_impu() (in file impurecord.c) an assignment "=" is used instead of a comparision operator "==". This leads to mess, when old contact expires. --- Modified: src/modules/ims_usrloc_scscf/impurecord.c --- Diff: https://github.com/kamailio/kamailio/commit/2b1e895e1a319b932a449c703a974c6… Patch: https://github.com/kamailio/kamailio/commit/2b1e895e1a319b932a449c703a974c6… --- diff --git a/src/modules/ims_usrloc_scscf/impurecord.c b/src/modules/ims_usrloc_scscf/impurecord.c index 9cee5bc765..6510d85aa1 100644 --- a/src/modules/ims_usrloc_scscf/impurecord.c +++ b/src/modules/ims_usrloc_scscf/impurecord.c @@ -1239,7 +1239,7 @@ int unlink_contact_from_impu(impurecord_t* impu, ucontact_t* contact, int write_ impucontact = impu->linked_contacts.head; while (impucontact) { - if ((contact = impucontact->contact)) { + if ((contact == impucontact->contact)) { remove_impucontact_from_list(impu, impucontact); if (write_to_db && db_mode == WRITE_THROUGH && (db_unlink_contact_from_impu(impu, contact) != 0)) { LM_ERR("Failed to un-link DB contact [%.*s] from IMPU [%.*s]...continuing but db will be out of sync!\n", contact->c.len, contact->c.s, impu->public_identity.len, impu->public_identity.s);

1 0

git:master:61f19592: modules: readme files regenerated - sanity ... [skip ci]
by Kamailio Dev 24 May '18

24 May '18

Module: kamailio Branch: master Commit: 61f19592b7a252357c444ec36d24650ad51dbe5c URL: https://github.com/kamailio/kamailio/commit/61f19592b7a252357c444ec36d24650… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-24T10:16:45+02:00 modules: readme files regenerated - sanity ... [skip ci] --- Modified: src/modules/sanity/README --- Diff: https://github.com/kamailio/kamailio/commit/61f19592b7a252357c444ec36d24650… Patch: https://github.com/kamailio/kamailio/commit/61f19592b7a252357c444ec36d24650… --- diff --git a/src/modules/sanity/README b/src/modules/sanity/README index f11c61e01e..14aa8462cc 100644 --- a/src/modules/sanity/README +++ b/src/modules/sanity/README @@ -120,10 +120,10 @@ Chapter 1. Admin Guide of the sanity_check function. The integer value is the sum of the check numbers which should be executed by default. - Default value is “999”. This resolves to the following list of checks: + Default value is “3047”. This resolves to the following list of checks: ruri_sip_version (1), ruri_scheme (2), required_headers (4), - cseq_method (32), cseq_value (64), cotent_length (128), expires_value - (256), proxy_require (512). + cseq_method (32), cseq_value (64), content_length (128), expires_value + (256), proxy_require (512), digest credentials (2048). Example 1.1. Set default_checks parameter ...

1 0

[kamailio/kamailio] sanity: Mistakes in the documentation article. (#1542)
by Konstantin 24 May '18

24 May '18

### Description  Wrong information in the documentation. 1. Default value of the parameter default_checks is 2791. In the documentation it is said that default is 999. 2. One check is not described - SANITY_CHECK_DUPTAGS. It was found in the version 4.4.7. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1542

2 2

git:master:6ff98560: sanity: updated docs to reflect default value for default_checks param
by Daniel-Constantin Mierla 24 May '18

24 May '18

Module: kamailio Branch: master Commit: 6ff985605b3fbb6aa350af4c21fc73afb8cf122f URL: https://github.com/kamailio/kamailio/commit/6ff985605b3fbb6aa350af4c21fc73a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-24T10:09:20+02:00 sanity: updated docs to reflect default value for default_checks param - reported by GH #1542 --- Modified: src/modules/sanity/doc/sanity_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6ff985605b3fbb6aa350af4c21fc73a… Patch: https://github.com/kamailio/kamailio/commit/6ff985605b3fbb6aa350af4c21fc73a… --- diff --git a/src/modules/sanity/doc/sanity_admin.xml b/src/modules/sanity/doc/sanity_admin.xml index cc8fe0f121..f951ca0031 100644 --- a/src/modules/sanity/doc/sanity_admin.xml +++ b/src/modules/sanity/doc/sanity_admin.xml @@ -152,10 +152,10 @@ is the sum of the check numbers which should be executed by default. </para> <para> - Default value is <quote>999</quote>. This resolves to the following list of + Default value is <quote>3047</quote>. This resolves to the following list of checks: ruri_sip_version (1), ruri_scheme (2), required_headers (4), - cseq_method (32), cseq_value (64), cotent_length (128), - expires_value (256), proxy_require (512). + cseq_method (32), cseq_value (64), content_length (128), + expires_value (256), proxy_require (512), digest credentials (2048). </para> <example> <title>Set <varname>default_checks</varname> parameter</title>

1 0

[kamailio/kamailio] P-CSCF crash during client login (#1526)
by uts09 24 May '18

24 May '18

### Description Kamailio P-CSCF is crashing during IMS client login. I am using Boghe IMS client,  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (gdb) list 352 } else { //contact already exists - update 353 LM_DBG("Contact already exists - not doing anything for now\n"); 354 } 355 356 // Update security parameters 357 if(ul.update_temp_security(_d, sec_params->type, sec_params, pcontact) != 0) 358 { 359 LM_ERR("Error updating temp security\n"); 360 } 361 ``` #### Log Messages  ``` [root@8bd3221bd31e pcscf]# kamailio -f /usr/local/src/kamailio-5.1/kamailio/misc/examples/ims/pcscf/kamailio.cfg -E -E -dd 0(32522) INFO: <core> [main.c:1939]: main(): private (per process) memory: 8388608 bytes 0(32522) INFO: <core> [core/ppcfg.c:82]: pp_subst_add(): ### added subst expression: /NETWORKNAME/mnc001.mcc001.3gppnetwork.org/ 0(32522) INFO: <core> [core/ppcfg.c:82]: pp_subst_add(): ### added subst expression: /HOSTNAME/pcscf.mnc001.mcc001.3gppnetwork.org/ loading modules under config path: /usr/local/lib64/kamailio/modules/ 0(32522) INFO: pv [pv_shv.c:60]: shvar_init_locks(): locks array size 16 0(32522) INFO: <core> [core/sctp_core.c:75]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Listening on udp: 172.17.0.3 [172.17.0.3]:5060 advertise net1.test:5060 Aliases: *: pcscf.net1.test:* WARNING: no fork mode 0(32522) INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(32522) INFO: rr [rr_mod.c:177]: mod_init(): outbound module not available 0(32522) INFO: auth [auth_mod.c:347]: mod_init(): qop set, but nonce-count (nc_enabled) support disabled 0(32522) INFO: path [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded 0(32522) INFO: path [path_mod.c:153]: mod_init(): outbound module not available 0(32522) INFO: ims_usrloc_pcscf [hslot.c:62]: ul_init_locks(): locks array size 512 0(32522) ERROR: rtpengine [rtpengine.c:2649]: select_rtpp_set(): no rtpp_set_list->rset_first 0(32522) NOTICE: rtpengine [rtpengine.c:1588]: mod_init(): Default rtpp set 0 NOT found 0(32522) WARNING: tm [tm.c:513]: fixup_routes(): t_on_failure("NATMANAGE"): empty/non existing route 0(32522) INFO: <core> [core/udp_server.c:153]: probe_max_receive_buffer(): SO_RCVBUF is initially 65535 0(32522) INFO: <core> [core/udp_server.c:205]: probe_max_receive_buffer(): SO_RCVBUF is finally 524280 0(32522) ERROR: <script>: event_route[htable:mod-init] { 4(32529) INFO: ctl [io_listener.c:210]: io_listen_loop(): io_listen_loop: using epoll_lt as the io watch method (auto detected) 5(32534) WARNING: ims_usrloc_pcscf [usrloc_db.c:61]: connect_db(): DB connection already open... continuing 0(32522) WARNING: ims_usrloc_pcscf [usrloc_db.c:61]: connect_db(): DB connection already open... continuing 7(32536) INFO: jsonrpcs [jsonrpcs_sock.c:443]: jsonrpc_dgram_process(): a new child 0/32536 0(32522) ERROR: <script>: REGISTER (sip:bob@net1.test (10.0.9.101:61728) to sip:bob@net1.test, d171ff89-efcb-de9f-9eb6-8dfdbf8b7221) 0(32522) INFO: rr [rr_mod.c:445]: pv_get_route_uri_f(): No route header present. 0(32522) INFO: ims_registrar_pcscf [sec_agree.c:255]: cscf_get_security(): No security parameters found 0(32522) ERROR: ims_registrar_pcscf [save.c:339]: save_pending(): Will save pending contact without security parameters Segmentation fault ``` #### SIP Traffic  ``` ................ 08:53:01.511644 IP 10.0.9.101.64932 > 172.17.0.3.5060: SIP: REGISTER sip:net1.test SIP/2.0 E...#...~.V. . e...........pREGISTER sip:net1.test SIP/2.0 Via: SIP/2.0/UDP 10.0.9.101:64932;branch=z9hG4bK537357731;rport From: <sip:bob@net1.test>;tag=537331589 To: <sip:bob@net1.test> Contact: <sip:bob@10.0.9.101:64932;transport=udp>;expires=600000;+g.oma.sip-im;language="en,fr";+g.3gpp.smsip;+g.oma.sip-im.large-message;audio;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-application.ims.iari.gsma-vs";+g.3gpp.cs-voice Call-ID: 4175e599-11d6-fd99-cdaf-225973666aa6 CSeq: 16432 REGISTER Content-Length: 0 Max-Forwards: 70 Allow: INVITE, ACK, CANCEL, BYE, MESSAGE, OPTIONS, NOTIFY, PRACK, UPDATE, REFER Privacy: none P-Access-Network-Info: ADSL;utran-cell-id-3gpp=00000000 User-Agent: IM-client/OMA1.0 Boghe-Win32/v2.0.153.836 P-Preferred-Identity: <sip:bob@net1.test> Supported: path ................ 08:53:01.512031 IP 172.17.0.3.5060 > 10.0.9.101.64932: SIP: SIP/2.0 100 Trying E..F.M..@....... . e.....2..SIP/2.0 100 Trying Via: SIP/2.0/UDP 10.0.9.101:64932;branch=z9hG4bK537357731;rport=64932;received=10.0.9.101 From: <sip:bob@net1.test>;tag=537331589 To: <sip:bob@net1.test> Call-ID: 4175e599-11d6-fd99-cdaf-225973666aa6 CSeq: 16432 REGISTER Server: TelcoSuite Proxy-CSCF Content-Length: 0 ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@8bd3221bd31e pcscf]# kamailio -v version: kamailio 5.2.0-dev5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 05:45:36 May 8 2018 with gcc 4.8.5 ``` * **Operating System**:  ``` Linux 8bd3221bd31e 3.10.0-229.el7.x86_64 #1 SMP Fri Mar 6 11:36:42 UTC 2015 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/1526

2 1

git:master:0f8a879a: ims_registrar_pcscf: Update tmp security only if there are sec-agree params in the message
by Tsvetomir Dimitrov 24 May '18

24 May '18

Module: kamailio Branch: master Commit: 0f8a879a212bd114aaa261a58e256f7fa51042c8 URL: https://github.com/kamailio/kamailio/commit/0f8a879a212bd114aaa261a58e256f7… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-05-09T10:12:58+03:00 ims_registrar_pcscf: Update tmp security only if there are sec-agree params in the message --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/0f8a879a212bd114aaa261a58e256f7… Patch: https://github.com/kamailio/kamailio/commit/0f8a879a212bd114aaa261a58e256f7… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 0edf7bd808..39dfe4d589 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -354,9 +354,11 @@ int save_pending(struct sip_msg* _m, udomain_t* _d) { } // Update security parameters - if(ul.update_temp_security(_d, sec_params->type, sec_params, pcontact) != 0) - { - LM_ERR("Error updating temp security\n"); + if(sec_params) { + if(ul.update_temp_security(_d, sec_params->type, sec_params, pcontact) != 0) + { + LM_ERR("Error updating temp security\n"); + } } ul.unlock_udomain(_d, &ci.via_host, ci.via_port, ci.via_prot);

1 0

git:master:62a669f9: Merge pull request #1527 from tdimitrov/pcscf_crash
by GitHub 24 May '18

24 May '18

Module: kamailio Branch: master Commit: 62a669f9f4125f88e60b2a1f621442a8ca923c82 URL: https://github.com/kamailio/kamailio/commit/62a669f9f4125f88e60b2a1f621442a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-05-24T08:36:28+02:00 Merge pull request #1527 from tdimitrov/pcscf_crash ims_registrar_pcscf: Update tmp security only if there are sec-agree â¦ --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/62a669f9f4125f88e60b2a1f621442a… Patch: https://github.com/kamailio/kamailio/commit/62a669f9f4125f88e60b2a1f621442a… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 0edf7bd808..39dfe4d589 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -354,9 +354,11 @@ int save_pending(struct sip_msg* _m, udomain_t* _d) { } // Update security parameters - if(ul.update_temp_security(_d, sec_params->type, sec_params, pcontact) != 0) - { - LM_ERR("Error updating temp security\n"); + if(sec_params) { + if(ul.update_temp_security(_d, sec_params->type, sec_params, pcontact) != 0) + { + LM_ERR("Error updating temp security\n"); + } } ul.unlock_udomain(_d, &ci.via_host, ci.via_port, ci.via_prot);

1 0

[kamailio/kamailio] ims_registrar_pcscf: Update tmp security only if there are sec-agree … (#1527)
by Tsvetomir Dimitrov 24 May '18

24 May '18

…params in the message   #### 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 #1526 #### Description  If a register is received without sec-agree parameters, a NULL pointer is deferenced, which causes segfault. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1527 -- Commit Summary -- * ims_registrar_pcscf: Update tmp security only if there are sec-agree params in the message -- File Changes -- M src/modules/ims_registrar_pcscf/save.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1527.patch https://github.com/kamailio/kamailio/pull/1527.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/1527

3 3

git:master:2a3ca594: topos_redis: proper length value when comparing to insert INVITE branch
by Daniel-Constantin Mierla 23 May '18

23 May '18

Module: kamailio Branch: master Commit: 2a3ca5942291d29de05b14338a36cecbec11f129 URL: https://github.com/kamailio/kamailio/commit/2a3ca5942291d29de05b14338a36cec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-23T20:43:48+02:00 topos_redis: proper length value when comparing to insert INVITE branch --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/2a3ca5942291d29de05b14338a36cec… Patch: https://github.com/kamailio/kamailio/commit/2a3ca5942291d29de05b14338a36cec… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 50e33121ee..bc810e702b 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1116,7 +1116,7 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, return -1; } - if(md->s_method.len==6 && strncmp(md->s_method.s, "INVITE", 7)==0) { + if(md->s_method.len==6 && strncmp(md->s_method.s, "INVITE", 6)==0) { if(tps_redis_insert_invite_branch(md)<0) { LM_ERR("failed to insert INVITE extra branch data\n"); return -1;

1 0

git:master:eb2f25ca: tm: set msg for log_prefix before running failure_route
by Daniel-Constantin Mierla 23 May '18

23 May '18

Module: kamailio Branch: master Commit: eb2f25ca0810f966d089da3aa1e32e3e98a4ab16 URL: https://github.com/kamailio/kamailio/commit/eb2f25ca0810f966d089da3aa1e32e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-23T20:42:51+02:00 tm: set msg for log_prefix before running failure_route - reported by GH #1531 --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/eb2f25ca0810f966d089da3aa1e32e3… Patch: https://github.com/kamailio/kamailio/commit/eb2f25ca0810f966d089da3aa1e32e3… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 9958e70333..8b94cec624 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -988,6 +988,7 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, t->on_failure=0; /* if continuing on timeout of a suspended transaction, reset the flag */ t->flags &= ~T_ASYNC_SUSPENDED; + log_prefix_set(faked_req); if (exec_pre_script_cb(faked_req, FAILURE_CB_TYPE)>0) { /* run a failure_route action if some was marked */ keng = sr_kemi_eng_get(); @@ -1002,6 +1003,7 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, } exec_post_script_cb(faked_req, FAILURE_CB_TYPE); } + log_prefix_set(NULL); /* update message flags, if changed in failure route */ t->uas.request->flags = faked_req->flags; }

1 0

git:master:f3109d4d: core: qm malloc - wrapper to print execution file and line for qm_debug_frag()
by Daniel-Constantin Mierla 23 May '18

23 May '18

Module: kamailio Branch: master Commit: f3109d4dcdc4ef810ccf4a8d17f28f7fce42271c URL: https://github.com/kamailio/kamailio/commit/f3109d4dcdc4ef810ccf4a8d17f28f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-23T18:43:22+02:00 core: qm malloc - wrapper to print execution file and line for qm_debug_frag() --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/f3109d4dcdc4ef810ccf4a8d17f28f7… Patch: https://github.com/kamailio/kamailio/commit/f3109d4dcdc4ef810ccf4a8d17f28f7… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 10abb86c43..0c3528544d 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -112,15 +112,18 @@ inline static unsigned long big_hash_idx(unsigned long s) #define END_CHECK_PATTERN2 0xabcdefed -static void qm_debug_frag(struct qm_block* qm, struct qm_frag* f, - const char* file, unsigned int line) +#define qm_debug_frag(qm, f, file, line) \ + qm_debug_check_frag((qm), (f), (file), (line), __FILE__, __LINE__) +static void qm_debug_check_frag(struct qm_block* qm, struct qm_frag* f, + const char* file, unsigned int line, + const char* efile, unsigned int eline) { if (f->check!=ST_CHECK_PATTERN){ LM_CRIT("BUG: qm: fragm. %p (address %p) " "beginning overwritten (%lx)! Memory allocator was called " - "from %s:%u. Fragment marked by %s:%lu.\n", + "from %s:%u. Fragment marked by %s:%lu. Exec from %s:%u.\n", f, (char*)f+sizeof(struct qm_frag), - f->check, file, line, f->file, f->line); + f->check, file, line, f->file, f->line, efile, eline); qm_status(qm); abort(); }; @@ -128,10 +131,10 @@ static void qm_debug_frag(struct qm_block* qm, struct qm_frag* f, (FRAG_END(f)->check2!=END_CHECK_PATTERN2)){ LM_CRIT("BUG: qm: fragm. %p (address %p) " "end overwritten (%lx, %lx)! Memory allocator was called " - "from %s:%u. Fragment marked by %s:%lu.\n", + "from %s:%u. Fragment marked by %s:%lu. Exec from %s:%u.\n", f, (char*)f+sizeof(struct qm_frag), FRAG_END(f)->check1, FRAG_END(f)->check2, - file, line, f->file, f->line); + file, line, f->file, f->line, efile, eline); qm_status(qm); abort(); } @@ -140,9 +143,10 @@ static void qm_debug_frag(struct qm_block* qm, struct qm_frag* f, (PREV_FRAG_END(f)->check2!=END_CHECK_PATTERN2) ) ){ LM_CRIT("BUG: qm: prev. fragm. tail overwritten(%lx, %lx)[%p:%p]! " "Memory allocator was called from %s:%u. Fragment marked by " - "%s:%lu.\n", + "%s:%lu. Exec from %s:%u.\n", PREV_FRAG_END(f)->check1, PREV_FRAG_END(f)->check2, f, - (char*)f+sizeof(struct qm_frag), file, line, f->file, f->line); + (char*)f+sizeof(struct qm_frag), file, line, f->file, f->line, + efile, eline); qm_status(qm); abort(); }

1 0

git:master:3334a011: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 23 May '18

23 May '18

Module: kamailio Branch: master Commit: 3334a011f6de4dc7284e2875e0d08158f8859482 URL: https://github.com/kamailio/kamailio/commit/3334a011f6de4dc7284e2875e0d0815… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-23T16:31:59+02:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/3334a011f6de4dc7284e2875e0d0815… Patch: https://github.com/kamailio/kamailio/commit/3334a011f6de4dc7284e2875e0d0815…

1 0

[kamailio/kamailio] p_usrloc: new parameter "mdb_availability_control" has been created. (#1529)
by hdikme 23 May '18

23 May '18

- The new parameter "mdb_availability_control" overwrites the "write_on_master_db" parameter based on the availability of master database.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1529 -- Commit Summary -- * p_usrloc: new parameter "mdb_availability_control" has been created. -- File Changes -- M src/modules/p_usrloc/doc/p_usrloc_admin.xml (20) M src/modules/p_usrloc/p_usrloc_mod.c (17) M src/modules/p_usrloc/p_usrloc_mod.h (6) M src/modules/p_usrloc/ul_db.c (34) M src/modules/p_usrloc/ul_db.h (1) M src/modules/p_usrloc/ul_db_watch.c (24) M src/modules/p_usrloc/ul_db_watch.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1529.patch https://github.com/kamailio/kamailio/pull/1529.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/1529

3 11

git:master:bec6a75a: Merge pull request #1529 from hdikme/mdb_avail_ctl
by GitHub 23 May '18

23 May '18

Module: kamailio Branch: master Commit: bec6a75ac664a2c8834339b499f3b4f907312e48 URL: https://github.com/kamailio/kamailio/commit/bec6a75ac664a2c8834339b499f3b4f… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: GitHub <noreply(a)github.com> Date: 2018-05-23T17:17:51+03:00 Merge pull request #1529 from hdikme/mdb_avail_ctl p_usrloc: new parameter "mdb_availability_control" has been created. --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db.h Modified: src/modules/p_usrloc/ul_db_watch.c Modified: src/modules/p_usrloc/ul_db_watch.h --- Diff: https://github.com/kamailio/kamailio/commit/bec6a75ac664a2c8834339b499f3b4f… Patch: https://github.com/kamailio/kamailio/commit/bec6a75ac664a2c8834339b499f3b4f…

1 0

git:master:61c96f0c: p_usrloc: new parameter "mdb_availability_control" has been created.
by Huseyin Dikme 23 May '18

23 May '18

Module: kamailio Branch: master Commit: 61c96f0cc8ddac3e0aa71046ec4021a90b629975 URL: https://github.com/kamailio/kamailio/commit/61c96f0cc8ddac3e0aa71046ec4021a… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: 2018-05-23T12:54:59+02:00 p_usrloc: new parameter "mdb_availability_control" has been created. - The new parameter "mdb_availability_control" overwrites the "write_on_db" parameter based on the availability of master database. --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db.h Modified: src/modules/p_usrloc/ul_db_watch.c Modified: src/modules/p_usrloc/ul_db_watch.h --- Diff: https://github.com/kamailio/kamailio/commit/61c96f0cc8ddac3e0aa71046ec4021a… Patch: https://github.com/kamailio/kamailio/commit/61c96f0cc8ddac3e0aa71046ec4021a…

1 0

git:5.0:0045f52d: tls: Fixed build tls module on Alpine dist
by Henning Westerholt 22 May '18

22 May '18

Module: kamailio Branch: 5.0 Commit: 0045f52da587a2aa1c050d920bc3900273409a23 URL: https://github.com/kamailio/kamailio/commit/0045f52da587a2aa1c050d920bc3900… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-22T21:32:14+02:00 tls: Fixed build tls module on Alpine dist (cherry picked from commit 9bdc1eba76f03cd009d7f04906f13bdb6579f511) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/0045f52da587a2aa1c050d920bc3900… Patch: https://github.com/kamailio/kamailio/commit/0045f52da587a2aa1c050d920bc3900… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 054d687e9c..3664469bd9 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -847,7 +847,7 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); -#if OPENSSL_VERSION_NUMBER >= 0x010100000L +#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) /* explicit execution of libssl cleanup to avoid being executed again * by atexit(), when shm is gone */ DBG("executing openssl v1.1+ cleanup\n");

1 0

git:5.1:649e3766: tls: Fixed build tls module on Alpine dist
by Henning Westerholt 22 May '18

22 May '18

Module: kamailio Branch: 5.1 Commit: 649e3766f4159a366a1befe49f132637239e7e9a URL: https://github.com/kamailio/kamailio/commit/649e3766f4159a366a1befe49f13263… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-22T21:31:18+02:00 tls: Fixed build tls module on Alpine dist (cherry picked from commit 9bdc1eba76f03cd009d7f04906f13bdb6579f511) --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/649e3766f4159a366a1befe49f13263… Patch: https://github.com/kamailio/kamailio/commit/649e3766f4159a366a1befe49f13263… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 030e3d2d79..ef27d08f7f 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -857,7 +857,7 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); -#if OPENSSL_VERSION_NUMBER >= 0x010100000L +#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) /* explicit execution of libssl cleanup to avoid being executed again * by atexit(), when shm is gone */ LM_DBG("executing openssl v1.1+ cleanup\n");

1 0

[kamailio/kamailio] tls: Fixed build tls module on Alpine dist (#1537)
by sergey-safarov 22 May '18

22 May '18

`OPENSSL_cleanup` is not exist on Alpine dist ([`tls_init.c:864`](https://github.com/kamailio/kamailio/blob/master/src/modules/tls/tls_init.c#L864)) Later wanted cherry-pick to 5.1 branch You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1537 -- Commit Summary -- * tls: Fixed build tls module on Alpine dist -- File Changes -- M src/modules/tls/tls_init.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1537.patch https://github.com/kamailio/kamailio/pull/1537.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/1537

2 2

git:master:9bdc1eba: tls: Fixed build tls module on Alpine dist
by Henning Westerholt 22 May '18

22 May '18

Module: kamailio Branch: master Commit: 9bdc1eba76f03cd009d7f04906f13bdb6579f511 URL: https://github.com/kamailio/kamailio/commit/9bdc1eba76f03cd009d7f04906f13bd… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-05-22T20:56:42+02:00 tls: Fixed build tls module on Alpine dist --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/9bdc1eba76f03cd009d7f04906f13bd… Patch: https://github.com/kamailio/kamailio/commit/9bdc1eba76f03cd009d7f04906f13bd… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 030e3d2d79..ef27d08f7f 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -857,7 +857,7 @@ void destroy_tls_h(void) tls_destroy_cfg(); tls_destroy_locks(); tls_ct_wq_destroy(); -#if OPENSSL_VERSION_NUMBER >= 0x010100000L +#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) /* explicit execution of libssl cleanup to avoid being executed again * by atexit(), when shm is gone */ LM_DBG("executing openssl v1.1+ cleanup\n");

1 0

git:master:5a0086fb: topoh: more verbose debug messages when decoding r-uri
by Daniel-Constantin Mierla 22 May '18

22 May '18

Module: kamailio Branch: master Commit: 5a0086fb5d54cf0411180a8426ea49ad440f147a URL: https://github.com/kamailio/kamailio/commit/5a0086fb5d54cf0411180a8426ea49a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-22T20:21:02+02:00 topoh: more verbose debug messages when decoding r-uri --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/5a0086fb5d54cf0411180a8426ea49a… Patch: https://github.com/kamailio/kamailio/commit/5a0086fb5d54cf0411180a8426ea49a… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 0b9db7289d..8f46382c8e 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -749,14 +749,19 @@ int th_unmask_ruri(sip_msg_t *msg) } if(th_get_uri_param_value(&REQ_LINE(msg).uri, &th_uparam_name, &eval)<0 - || eval.len<=0) + || eval.len<=0) { + LM_DBG("no uri param [%.*s] in [%.*s]\n", + th_uparam_name.len, th_uparam_name.s, + REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); return -1; + } out.s = th_mask_decode(eval.s, eval.len, &th_uparam_prefix, 0, &out.len); if(out.s==NULL) { - LM_ERR("cannot decode r-uri\n"); + LM_ERR("cannot decode r-uri [%.*s]\n", + REQ_LINE(msg).uri.len,REQ_LINE(msg).uri.s); return -1; }

1 0

git:master:420fa5e5: core: cfg.lex - removed redundant token defining max_branches
by Daniel-Constantin Mierla 22 May '18

22 May '18

Module: kamailio Branch: master Commit: 420fa5e581af5668cdecd0c97b555f4d673105f7 URL: https://github.com/kamailio/kamailio/commit/420fa5e581af5668cdecd0c97b555f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-22T13:46:58+02:00 core: cfg.lex - removed redundant token defining max_branches --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/420fa5e581af5668cdecd0c97b555f4… Patch: https://github.com/kamailio/kamailio/commit/420fa5e581af5668cdecd0c97b555f4… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 033f87e3df..9801dd3436 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -453,7 +453,7 @@ REPLY_ROUTE_CALLBACK "reply_route_callback" EVENT_ROUTE_CALLBACK "event_route_callback" MAX_RECURSIVE_LEVEL "max_recursive_level" -MAX_BRANCHES_PARAM "max_branches"|"max_branches" +MAX_BRANCHES_PARAM "max_branches" LATENCY_CFG_LOG latency_cfg_log LATENCY_LOG latency_log

1 0

Set arbitrary destination port for outgoing request/reply
by Tsvetomir Dimitrov 21 May '18

21 May '18

Hello, Is it possible to modify the destination UDP port number for outgoing SIP request/response? I am working on a sec-agree extension implementation for Kamailio and after negotiating the IPSec tunnel parameters I need to redirect the messages to the new port number. I checked the code and looks like the destination port is determined mainly by the VIA headers, which doesn't work for me. Is it possible to achieve this without messing up with the core? Best regards, Tsvetomir

2 2

git:master:3647cc1a: app_jsdt: implemented kemi KSR.pv.getw(...)
by Daniel-Constantin Mierla 21 May '18

21 May '18

Module: kamailio Branch: master Commit: 3647cc1a9b2e85e71657ba3dd3bba21c6bdc5ff5 URL: https://github.com/kamailio/kamailio/commit/3647cc1a9b2e85e71657ba3dd3bba21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-20T21:17:47+02:00 app_jsdt: implemented kemi KSR.pv.getw(...) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/3647cc1a9b2e85e71657ba3dd3bba21… Patch: https://github.com/kamailio/kamailio/commit/3647cc1a9b2e85e71657ba3dd3bba21… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 8f4f3de18c..ef86d51165 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -155,11 +155,23 @@ int sr_kemi_jsdt_return_int(duk_context *J, sr_kemi_t *ket, int rc) return app_jsdt_return_false(J); } +/** + * + */ +static int jsdt_sr_return_none(duk_context *J, int rmode) +{ + if(rmode) { + duk_push_lstring(J, "<<null>>", 8); + return 1; + } else { + return 0; + } +} /** * */ -static int jsdt_sr_pv_get(duk_context *J) +static int jsdt_sr_pv_get_mode(duk_context *J, int rmode) { str pvn; pv_spec_t *pvs; @@ -171,28 +183,32 @@ static int jsdt_sr_pv_get(duk_context *J) pvn.s = (char*)duk_to_string(J, 0); if(pvn.s==NULL || env_J->msg==NULL) - return 0; + return jsdt_sr_return_none(J, rmode); pvn.len = strlen(pvn.s); LM_DBG("pv get: %s\n", pvn.s); pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - return 0; + return jsdt_sr_return_none(J, rmode); } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - return 0; + return jsdt_sr_return_none(J, rmode); } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(env_J->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - return 0; + return jsdt_sr_return_none(J, rmode); } if(val.flags&PV_VAL_NULL) { - duk_push_string(J, NULL); - return 1; + if(rmode) { + jsdt_sr_return_none(J, rmode); + } else { + duk_push_string(J, NULL); + return 1; + } } if(val.flags&PV_TYPE_INT) { duk_push_int(J, val.ri); @@ -202,6 +218,22 @@ static int jsdt_sr_pv_get(duk_context *J) return 1; } +/** + * + */ +static int jsdt_sr_pv_get(duk_context *J) +{ + return jsdt_sr_pv_get_mode(J, 0); +} + +/** + * + */ +static int jsdt_sr_pv_getw(duk_context *J) +{ + return jsdt_sr_pv_get_mode(J, 1); +} + /** * */

1 0

git:master:cb97be77: app_sqlang: added KSR.pv.getw(...)
by Daniel-Constantin Mierla 21 May '18

21 May '18

Module: kamailio Branch: master Commit: cb97be77664625a4fb454bdd6d5c84c8a2c7adb3 URL: https://github.com/kamailio/kamailio/commit/cb97be77664625a4fb454bdd6d5c84c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-19T19:33:56+02:00 app_sqlang: added KSR.pv.getw(...) --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/cb97be77664625a4fb454bdd6d5c84c… Patch: https://github.com/kamailio/kamailio/commit/cb97be77664625a4fb454bdd6d5c84c… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 624e13908f..77d98ddc3d 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -275,7 +275,20 @@ static int sqlang_gettype(HSQUIRRELVM J, int idx) /** * */ -static SQInteger sqlang_sr_pv_get(HSQUIRRELVM J) +static SQInteger sqlang_sr_get_str_null(HSQUIRRELVM J, int rmode) +{ + if(rmode) { + sqlang_pushlstring(J, "<<null>>", 8); + return 1; + } else { + return 0; + } +} + +/** + * + */ +static SQInteger sqlang_sr_pv_get_mode(HSQUIRRELVM J, int rmode) { str pvn; pv_spec_t *pvs; @@ -287,24 +300,24 @@ static SQInteger sqlang_sr_pv_get(HSQUIRRELVM J) pvn.s = (char*)sqlang_to_string(J, 0); if(pvn.s==NULL || env_J->msg==NULL) - return 0; + return sqlang_sr_get_str_null(J, rmode); pvn.len = strlen(pvn.s); LM_DBG("pv get: %s\n", pvn.s); pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - return 0; + return sqlang_sr_get_str_null(J, rmode); } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - return 0; + return sqlang_sr_get_str_null(J, rmode); } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(env_J->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - return 0; + return sqlang_sr_get_str_null(J, rmode); } if(val.flags&PV_VAL_NULL) { sqlang_pushstring(J, NULL); @@ -318,6 +331,22 @@ static SQInteger sqlang_sr_pv_get(HSQUIRRELVM J) return 1; } +/** + * + */ +static SQInteger sqlang_sr_pv_get(HSQUIRRELVM J) +{ + return sqlang_sr_pv_get_mode(J, 0); +} + +/** + * + */ +static SQInteger sqlang_sr_pv_getw(HSQUIRRELVM J) +{ + return sqlang_sr_pv_get_mode(J, 1); +} + /** * */ @@ -508,6 +537,7 @@ static SQInteger sqlang_sr_pv_is_null (HSQUIRRELVM J) const SQRegFunction _sr_kemi_pv_J_Map[] = { { "get", sqlang_sr_pv_get, 2 /* 1 args */, NULL }, + { "getw", sqlang_sr_pv_getw, 2 /* 1 args */, NULL }, { "seti", sqlang_sr_pv_seti, 3 /* 2 args */, NULL }, { "sets", sqlang_sr_pv_sets, 4 /* 2 args */, NULL }, { "unset", sqlang_sr_pv_unset, 2 /* 1 args */, NULL },

1 0

[kamailio/kamailio] db_mongodb has a problem with projection (#1479)
by kelchy 20 May '18

20 May '18

### Description on upgrade to 5.1.2, db_mongodb broke ### Troubleshooting i create a [PR](https://github.com/kamailio/kamailio/pull/1477) to print out any mongo query error then i saw the debug messages below #### Reproduction install 5.1.2, use mongo as db for sip_trace module #### Debugging Data ``` DEBUG: db_mongodb [mongodb_connection.c:55]: db_mongodb_new_connection(): connection open to: mongodb://user:pass@mongo1.abc.com:17017/collection DEBUG: db_mongodb [mongodb_dbase.c:904]: db_mongodb_query(): query to collection [version] DEBUG: db_mongodb [mongodb_dbase.c:938]: db_mongodb_query(): query filter: { "table_name" : "sip_trace" } DEBUG: db_mongodb [mongodb_dbase.c:966]: db_mongodb_query(): columns filter: { "projection" : { "table_version" : 1 } } DEBUG: db_mongodb [mongodb_dbase.c:782]: db_mongodb_store_result(): An error occurred: Unsupported projection option: projection: { table_version: 1 } ERROR: <core> [db.c:450]: db_check_table_version(): invalid version 0 for table sip_trace found, expected 4 (check table structure and table "version") ERROR: siptrace [siptrace.c:435]: child_init(): error during table version check ERROR: <core> [core/sr_module.c:942]: init_mod_child(): error while initializing module siptrace (/usr/lib64/kamailio/modules/siptrace.so) (idx: 39 rank: -2 desc: [Http Async Worker]) ``` #### Log Messages #### SIP Traffic ### Possible Solutions change the way mongo builds the query ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 06:43:15 Mar 9 2018 with gcc 4.8.2 ``` * **Operating System**:  ``` Ubuntu 14.04.1 LTS \n \l Linux hostname 3.13.0-53-generic #89-Ubuntu SMP Wed May 20 10:34:39 UTC 2015 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/1479

2 10

git:master:abf6039d: app_python3: added KSR.pv.getw(...)
by Daniel-Constantin Mierla 18 May '18

18 May '18

Module: kamailio Branch: master Commit: abf6039da53ba373c5e389e162d5b21a431fb3ee URL: https://github.com/kamailio/kamailio/commit/abf6039da53ba373c5e389e162d5b21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-18T09:05:04+02:00 app_python3: added KSR.pv.getw(...) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/abf6039da53ba373c5e389e162d5b21… Patch: https://github.com/kamailio/kamailio/commit/abf6039da53ba373c5e389e162d5b21… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index ce6bc68733..cacd9067f4 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -662,7 +662,20 @@ static sr_kemi_t _sr_apy_kemi_test[] = { /** * */ -static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) +PyObject *sr_apy_kemi_return_none_mode(int rmode) +{ + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, + int rmode) { str pvn; pv_spec_t *pvs; @@ -675,7 +688,7 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) if(env_P==NULL) { LM_ERR("invalid Python environment attributes\n"); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } if(env_P->msg==NULL) { lmsg = faked_msg_next(); @@ -685,12 +698,12 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) if(!PyArg_ParseTuple(args, "s:pv.get", &pvn.s)) { LM_ERR("unable to retrieve str param\n"); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } if(pvn.s==NULL || lmsg==NULL) { LM_ERR("invalid context attributes\n"); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } pvn.len = strlen(pvn.s); @@ -698,21 +711,21 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(lmsg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } if(val.flags&PV_VAL_NULL) { - return sr_apy_kemi_return_none(); + return sr_apy_kemi_return_none_mode(rmode); } if(val.flags&PV_TYPE_INT) { return sr_kemi_apy_return_int(NULL, val.ri); @@ -720,6 +733,22 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) return sr_apy_kemi_return_str(NULL, val.rs.s, val.rs.len); } +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_mode(self, args, 0); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_mode(self, args, 1); +} + /** * */ @@ -951,6 +980,8 @@ static PyObject *sr_apy_kemi_f_pv_is_null(PyObject *self, PyObject *args) static PyMethodDef _sr_apy_kemi_pv_Methods[] = { {"get", sr_apy_kemi_f_pv_get, METH_VARARGS, NAME " - pv get value"}, + {"getw", sr_apy_kemi_f_pv_getw, METH_VARARGS, + NAME " - pv get value or <<null>>"}, {"seti", sr_apy_kemi_f_pv_seti, METH_VARARGS, NAME " - pv set int value"}, {"sets", sr_apy_kemi_f_pv_sets, METH_VARARGS,

1 0

git:master:e8b434f1: app_python: added KSR.pv.getw() to kemi expors
by Daniel-Constantin Mierla 18 May '18

18 May '18

Module: kamailio Branch: master Commit: e8b434f13f56b2f34d5b30bf728c4685c488e63c URL: https://github.com/kamailio/kamailio/commit/e8b434f13f56b2f34d5b30bf728c468… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-18T09:03:04+02:00 app_python: added KSR.pv.getw() to kemi expors - wrapper function for returning the value --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e8b434f13f56b2f34d5b30bf728c468… Patch: https://github.com/kamailio/kamailio/commit/e8b434f13f56b2f34d5b30bf728c468… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index b7cca69bdf..6ea72e3d1c 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -657,6 +657,18 @@ static sr_kemi_t _sr_apy_kemi_test[] = { { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; +/** + * + */ +PyObject *sr_apy_kemi_return_none_mode(int rmode) +{ + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } +} + /** * */ @@ -674,11 +686,7 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, if(env_P==NULL) { LM_ERR("invalid Python environment attributes\n"); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - return sr_apy_kemi_return_none(); - } + return sr_apy_kemi_return_none_mode(rmode); } if(env_P->msg==NULL) { lmsg = faked_msg_next(); @@ -688,20 +696,12 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, if(!PyArg_ParseTuple(args, "s:pv.get", &pvn.s)) { LM_ERR("unable to retrieve str param\n"); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - return sr_apy_kemi_return_none(); - } + return sr_apy_kemi_return_none_mode(rmode); } if(pvn.s==NULL || lmsg==NULL) { LM_ERR("invalid context attributes\n"); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - return sr_apy_kemi_return_none(); - } + return sr_apy_kemi_return_none_mode(rmode); } pvn.len = strlen(pvn.s); @@ -709,37 +709,21 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - return sr_apy_kemi_return_none(); - } + return sr_apy_kemi_return_none_mode(rmode); } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - return sr_apy_kemi_return_none(); - } + return sr_apy_kemi_return_none_mode(rmode); } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(lmsg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - return sr_apy_kemi_return_none(); - } + return sr_apy_kemi_return_none_mode(rmode); } if(val.flags&PV_VAL_NULL) { - if(rmode) { - return sr_apy_kemi_return_str(NULL, "<<null>>", 8); - } else { - return sr_apy_kemi_return_none(); - } + return sr_apy_kemi_return_none_mode(rmode); } if(val.flags&PV_TYPE_INT) { return sr_kemi_apy_return_int(NULL, val.ri); @@ -758,7 +742,7 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) /** * */ -static PyObject *sr_apy_kemi_f_pv_get_w(PyObject *self, PyObject *args) +static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) { return sr_apy_kemi_f_pv_get_mode(self, args, 1); } @@ -994,6 +978,8 @@ static PyObject *sr_apy_kemi_f_pv_is_null(PyObject *self, PyObject *args) static PyMethodDef _sr_apy_kemi_pv_Methods[] = { {"get", sr_apy_kemi_f_pv_get, METH_VARARGS, NAME " - pv get value"}, + {"getw", sr_apy_kemi_f_pv_getw, METH_VARARGS, + NAME " - pv get value or <<null>>"}, {"seti", sr_apy_kemi_f_pv_seti, METH_VARARGS, NAME " - pv set int value"}, {"sets", sr_apy_kemi_f_pv_sets, METH_VARARGS,

1 0

git:master:115fa38f: app_python: added KSR.pv.getw(...)
by Daniel-Constantin Mierla 18 May '18

18 May '18

Module: kamailio Branch: master Commit: 115fa38f427b1bc3730add9078c44219b25960cb URL: https://github.com/kamailio/kamailio/commit/115fa38f427b1bc3730add9078c4421… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-18T08:48:37+02:00 app_python: added KSR.pv.getw(...) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/115fa38f427b1bc3730add9078c4421… Patch: https://github.com/kamailio/kamailio/commit/115fa38f427b1bc3730add9078c4421… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index e9759d43d6..b7cca69bdf 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -660,7 +660,8 @@ static sr_kemi_t _sr_apy_kemi_test[] = { /** * */ -static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) +static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, + int rmode) { str pvn; pv_spec_t *pvs; @@ -673,7 +674,11 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) if(env_P==NULL) { LM_ERR("invalid Python environment attributes\n"); - return sr_apy_kemi_return_none(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } if(env_P->msg==NULL) { lmsg = faked_msg_next(); @@ -683,12 +688,20 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) if(!PyArg_ParseTuple(args, "s:pv.get", &pvn.s)) { LM_ERR("unable to retrieve str param\n"); - return sr_apy_kemi_return_none(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } if(pvn.s==NULL || lmsg==NULL) { LM_ERR("invalid context attributes\n"); - return sr_apy_kemi_return_none(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } pvn.len = strlen(pvn.s); @@ -696,21 +709,37 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - return sr_apy_kemi_return_none(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - return sr_apy_kemi_return_none(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(lmsg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - return sr_apy_kemi_return_none(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } if(val.flags&PV_VAL_NULL) { - return sr_apy_kemi_return_none(); + if(rmode) { + return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else { + return sr_apy_kemi_return_none(); + } } if(val.flags&PV_TYPE_INT) { return sr_kemi_apy_return_int(NULL, val.ri); @@ -718,6 +747,22 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) return sr_apy_kemi_return_str(NULL, val.rs.s, val.rs.len); } +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_mode(self, args, 0); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_get_w(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_mode(self, args, 1); +} + /** * */

1 0

Whats is wrong in this call
by Sergey Safarov 15 May '18

15 May '18

Hello I have a call with not passed ACK by Kamailio. http://prntscr.com/jhtobo Same behaviour i looked before when SIP endpoint contact string is wrong In this call look as contact string correct is correct (packets 7 and 8) and i not understand why ACK (packet 9) not passed to callee. Could you help me understand this. PCAP file is create using homer tracer and TCP transport packets is stored as UDP. Sergey

3 3

git:master:5b1355aa: db2_ldap: fix compilation warning
by Victor Seva 15 May '18

15 May '18

Module: kamailio Branch: master Commit: 5b1355aa3d9404a5165b0afbfdac384fe9cf785a URL: https://github.com/kamailio/kamailio/commit/5b1355aa3d9404a5165b0afbfdac384… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-05-15T22:11:52+02:00 db2_ldap: fix compilation warning > ld_fld.c:831:19: warning: unused function 'db_double2ldap_str' [-Wunused-function] > static inline int db_double2ldap_str(struct sbuf* buf, db_fld_t* fld) > ^ > 1 warning generated. --- Modified: src/modules/db2_ldap/ld_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/5b1355aa3d9404a5165b0afbfdac384… Patch: https://github.com/kamailio/kamailio/commit/5b1355aa3d9404a5165b0afbfdac384… --- diff --git a/src/modules/db2_ldap/ld_fld.c b/src/modules/db2_ldap/ld_fld.c index 564762b64a..867c873e8f 100644 --- a/src/modules/db2_ldap/ld_fld.c +++ b/src/modules/db2_ldap/ld_fld.c @@ -828,7 +828,7 @@ static inline int db_float2ldap_str(struct sbuf* buf, db_fld_t* fld) } -static inline int db_double2ldap_str(struct sbuf* buf, db_fld_t* fld) +/*static inline int db_double2ldap_str(struct sbuf* buf, db_fld_t* fld) { char tmp[16]; int len; @@ -839,7 +839,7 @@ static inline int db_double2ldap_str(struct sbuf* buf, db_fld_t* fld) return -1; } return sb_add(buf, tmp, len); -} +}*/ static inline int ld_db2ldap(struct sbuf* buf, db_fld_t* fld) { struct ld_fld* lfld;

1 0

git:master:5a5475f3: ims_usrloc_pcscf: fix compilation warning
by Victor Seva 15 May '18

15 May '18

Module: kamailio Branch: master Commit: 5a5475f372591b1be5c3dc7851ea509149131509 URL: https://github.com/kamailio/kamailio/commit/5a5475f372591b1be5c3dc7851ea509… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-05-15T20:25:00+02:00 ims_usrloc_pcscf: fix compilation warning > pcontact.c:122:5: warning: enumeration value 'SECURITY_NONE' not handled in switch [-Wswitch] > switch (_p->type) > ^~~~~~ --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c --- Diff: https://github.com/kamailio/kamailio/commit/5a5475f372591b1be5c3dc7851ea509… Patch: https://github.com/kamailio/kamailio/commit/5a5475f372591b1be5c3dc7851ea509… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index ff666f8103..60d6b28132 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -138,7 +138,8 @@ void free_security(security_t* _p) shm_free(_p->data.tls); break; - //default: Nothing to deallocate + default: // Nothing to deallocate + break; } shm_free(_p);

1 0

git:master:dbae2561: db_perlvdb: fix compilation warning
by Victor Seva 15 May '18

15 May '18

Module: kamailio Branch: master Commit: dbae2561720c97200d8e58e1e6c408a943e3c07b URL: https://github.com/kamailio/kamailio/commit/dbae2561720c97200d8e58e1e6c408a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-05-15T20:18:02+02:00 db_perlvdb: fix compilation warning > db_perlvdb.c: In function 'db_perlvdb_bind_api': > db_perlvdb.c:98:24: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] > dbb->replace = perlvdb_db_replace; > ^ --- Modified: src/modules/db_perlvdb/perlvdbfunc.c Modified: src/modules/db_perlvdb/perlvdbfunc.h --- Diff: https://github.com/kamailio/kamailio/commit/dbae2561720c97200d8e58e1e6c408a… Patch: https://github.com/kamailio/kamailio/commit/dbae2561720c97200d8e58e1e6c408a… --- diff --git a/src/modules/db_perlvdb/perlvdbfunc.c b/src/modules/db_perlvdb/perlvdbfunc.c index c6d6513616..e27d83c254 100644 --- a/src/modules/db_perlvdb/perlvdbfunc.c +++ b/src/modules/db_perlvdb/perlvdbfunc.c @@ -202,7 +202,8 @@ int perlvdb_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, /* * Just like insert, but replace the row if it exists */ -int perlvdb_db_replace(const db1_con_t* h, const db_key_t* k, const db_val_t* v, const int n) { +int perlvdb_db_replace(const db1_con_t* h, const db_key_t* k, const db_val_t* v, + const int n, const int un, const int m) { return perlvdb_db_insertreplace(h, k, v, n, PERL_VDB_REPLACEMETHOD); } diff --git a/src/modules/db_perlvdb/perlvdbfunc.h b/src/modules/db_perlvdb/perlvdbfunc.h index 33f392b755..0db42a28ee 100644 --- a/src/modules/db_perlvdb/perlvdbfunc.h +++ b/src/modules/db_perlvdb/perlvdbfunc.h @@ -48,7 +48,8 @@ void perlvdb_db_close(db1_con_t* h); int perlvdb_use_table(db1_con_t* h, const str* t); int perlvdb_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, const int n); -int perlvdb_db_replace(const db1_con_t* h, const db_key_t* k, const db_val_t* v, const int n); +int perlvdb_db_replace(const db1_con_t* h, const db_key_t* k, const db_val_t* v, + const int n, const int un, const int m); int perlvdb_db_delete(const db1_con_t* h, const db_key_t* k, const db_op_t* o, const db_val_t* v, const int n); int perlvdb_db_update(const db1_con_t* h, const db_key_t* k, const db_op_t* o,

1 0

git:master:c3e36a1e: app_lua: kemi - exported KSR.pv.getw("$...")
by Daniel-Constantin Mierla 15 May '18

15 May '18

Module: kamailio Branch: master Commit: c3e36a1eb2ff70f94b83a42de3e901f4ba142813 URL: https://github.com/kamailio/kamailio/commit/c3e36a1eb2ff70f94b83a42de3e901f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-15T07:54:24+02:00 app_lua: kemi - exported KSR.pv.getw("$...") - get the value of the pseudo-variable if it is not $null and the string "<<null>>" if it is $null - useful to use in building log messages without testing if the variable is set, otherwise lua throws error while trying to concatenate null value --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/c3e36a1eb2ff70f94b83a42de3e901f… Patch: https://github.com/kamailio/kamailio/commit/c3e36a1eb2ff70f94b83a42de3e901f… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index f6155dc741..6edba5d7a7 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -884,7 +884,7 @@ static const luaL_Reg _sr_hdr_Map [] = { /** * */ -static int lua_sr_pv_get (lua_State *L) +static int lua_sr_pv_get_val (lua_State *L, int rmode) { str pvn; pv_spec_t *pvs; @@ -895,35 +895,56 @@ static int lua_sr_pv_get (lua_State *L) env_L = sr_lua_env_get(); pvn.s = (char*)lua_tostring(L, -1); - if(pvn.s==NULL || env_L->msg==NULL) - return 0; + if(pvn.s==NULL || env_L->msg==NULL) { + if(rmode) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else { + return 0; + } + } pvn.len = strlen(pvn.s); LM_DBG("pv get: %s\n", pvn.s); pl = pv_locate_name(&pvn); - if(pl != pvn.len) - { + if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - return 0; + if(rmode) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else { + return 0; + } } pvs = pv_cache_get(&pvn); - if(pvs==NULL) - { + if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - return 0; + if(rmode) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else { + return 0; + } } memset(&val, 0, sizeof(pv_value_t)); - if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) - { + if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - return 0; + if(rmode) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else { + return 0; + } } - if(val.flags&PV_VAL_NULL) - { - return 0; + if(val.flags&PV_VAL_NULL) { + if(rmode) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else { + return 0; + } } - if(val.flags&PV_TYPE_INT) - { + if(val.flags&PV_TYPE_INT) { lua_pushinteger(L, val.ri); return 1; } @@ -931,6 +952,22 @@ static int lua_sr_pv_get (lua_State *L) return 1; } +/** + * + */ +static int lua_sr_pv_get (lua_State *L) +{ + return lua_sr_pv_get_val(L, 0); +} + +/** + * + */ +static int lua_sr_pv_getw (lua_State *L) +{ + return lua_sr_pv_get_val(L, 1); +} + /** * */ @@ -1137,6 +1174,7 @@ static int lua_sr_pv_is_null (lua_State *L) */ static const luaL_Reg _sr_pv_Map [] = { {"get", lua_sr_pv_get}, + {"getw", lua_sr_pv_getw}, {"seti", lua_sr_pv_seti}, {"sets", lua_sr_pv_sets}, {"unset", lua_sr_pv_unset},

1 0

[kamailio/kamailio] kazoo: wrong BLF when used application/dialog-info+xml (#1489)
by sergey-safarov 10 May '18

10 May '18

### Description Yealink phones is subscribes using `application/dialog-info+xml`. In this case for many phones false reported `early` state. ### Troubleshooting #### Reproduction Not knows. Some phones is displayes properly, some is not. #### Debugging Data none #### Log Messages not yet done #### SIP Traffic In provided pcap. is subscribed two clients `yealink` phone and `x-lite` softphone. Created call to extension 201 (sip login). For `x-lite` status is changed properly for `yealink` is not. Filters `udp.port==13322` caller leg `udp.port==1025` callee legs `udp.srcport==5060&&udp.dstport==5060` yealink phone `udp.port==15502` xlite [blf-test.pcap.gz](https://github.com/kamailio/kamailio/files/1849284/blf-te… packet 14 - kamailio reports 201 extension is Available to xlite packet 25 - kamailio reports 201 is early to yealink (unexpected) packet 108 - created call to 201 extension packer 109 - ringing to caller packet 118 - kamailio send ringing to caller packet 119 - INVITE send to callee packet 124 - callee send Trying packet 127 - kamailio reports 201 is ringing to yalink packet 129 - kamailio reports 201 is busy to xlite packet 145 - kamailio send session progress to caller packet 146 - callee send ringing packet 154 - caller send cancel packet 156 - kamailio send early to yealink (unexpected) packet 156 - kamailio send Available to x-lite ### Possible Solutions not known ### Additional Information Kamailio installed from kazoo team repo ``` [root@kamailio01 ~]# kamailio -V version: kamailio 5.0.3 (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_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 11:07:05 Sep 23 2017 with gcc 4.8.5 [root@kamailio01 ~]# ``` * **Operating System**:  ``` [root@kamailio01 ~]# uname -a Linux kamailio01.cloudpbx.ai.co.uk 3.10.0-514.6.1.el7.x86_64 #1 SMP Wed Jan 18 13:06:36 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux [root@kamailio01 ~]# cat /etc/redhat-release CentOS Linux release 7.3.1611 (Core) [root@kamailio01 ~]# ``` -- 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/1489

2 9

[kamailio/kamailio] app_lua: htable event_callback failed (#1519)
by Surendra Tiwari 09 May '18

09 May '18

### Description event_callback for app_lua is not working ### Troubleshooting #### Reproduction # ----- app_lua params ---- 1. load the htable and app_lua with following parameters modparam("app_lua", "reload", 1) modparam("app_lua", "load", "/usr/local/etc/kamailio/route.lua") modparam("htable", "event_callback", "ksr_htable_event") -- event callback function implemented in Lua function ksr_htable_event(evname) KSR.info("===== htable module triggered event: " .. evname .. "\n"); return 1; end #### Debugging Data May 3 12:15:19 ip-172-31-4-160 kamailio[9797]: ERROR: app_lua [app_lua_api.c:652]: app_lua_run_ex(): lua loading state not initialized (call: ksr_htable_event) ``` (paste your debugging data here) ``` #### Log Messages ``` May 3 12:15:19 ip-172-31-4-160 kamailio[9797]: ERROR: app_lua [app_lua_api.c:652]: app_lua_run_ex(): lua loading state not initialized (call: ksr_htable_event) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ip-172-31-4-160:/usr/local/etc/kamailio# kamailio -v version: kamailio 5.1.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 15:16:50 Apr 24 2018 with gcc 4.8.4 ``` * **Operating System**:  ``` root@ip-172-31-4-160:/usr/local/etc/kamailio# uname -a Linux ip-172-31-4-160 3.13.0-143-generic #192-Ubuntu SMP Tue Feb 27 10:45:36 UTC 2018 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/1519

2 12

git: new commits in branch 5.1
by Daniel-Constantin Mierla 09 May '18

09 May '18

- URL: https://github.com/kamailio/kamailio/commit/cefd474c13756b2a37b5969620ab8c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T11:59:31+02:00 cfgutils: update route_if_exists() to have same behaviour as route() - do not run the route block as a top route - related to GH #1503 (cherry picked from commit 9670bd80550b9e0c2af1d5d61df618292346ba28) - URL: https://github.com/kamailio/kamailio/commit/c5df8556f2c4189c01e4ddf3f9a1309… Author: Konstantin Poliakov <k.polyakov(a)mightycall.com> Date: 2018-05-09T12:00:46+02:00 nathelper: it doesn't ping contacts if ping_nated_only=0 - nathelper sends ping only if nat flag is specified, but if ping_nated_only=0 it should ping all contact in any case. (cherry picked from commit b34cf58a3a88e5ed2b2aa6aa9e5df0e5bb1808f9) - URL: https://github.com/kamailio/kamailio/commit/d75068d2ecd12189c0cc238ed073785… Author: Konstantin Poliakov <k.polyakov(a)mightycall.com> Date: 2018-05-09T12:00:55+02:00 nathelper: moved var declaration into the begining of function. (cherry picked from commit 2fb84e5e101b61bbaedc18d8b37188cbc6b1cee8) - URL: https://github.com/kamailio/kamailio/commit/e0c84fcd3159ed81d66461c9b14f385… Author: Konstantin Poliakov <k.polyakov(a)mightycall.com> Date: 2018-05-09T12:01:13+02:00 usrloc: use UL_DB_EXPIRES_SET() inside get_all_db_ucontacts() - fix matching date field for some backends, such as mongodb, as well as obey ul_expires_type value (cherry picked from commit 944dc1dc1e6261a3c179ff11bf3531e379eb9f35) - URL: https://github.com/kamailio/kamailio/commit/b30e500576ba1e4e31b530c5bee6369… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:01:24+02:00 usrloc: removed useless set of db type for expire column (cherry picked from commit 943724e62c2b3bb98a37d9f496cc6c76ecb976cb) - URL: https://github.com/kamailio/kamailio/commit/4b174a25e895545e4e101b23ad4d6cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:01:52+02:00 core: print rr type for rpc dns.view (cherry picked from commit b72e0b6984e87b42f0a578a6b220a28a80e67737) - URL: https://github.com/kamailio/kamailio/commit/981fd4dc2ca4ef49544385b1b82b0dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:02:05+02:00 core: dns - print index and remove per record type printing added previously - type is already printed at the top of the structure (cherry picked from commit 6285b5ebe02d39bf77baa8f29d16de246dc1ad77) - URL: https://github.com/kamailio/kamailio/commit/89a91f11f5bdb87d91f5b2003ef7bfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:02:18+02:00 htable: added parameter event_callback_mode - control when event_route[htable:init] is executed: 0 - after all modules were initialized; 1 - in first worker process; (default 0) - fixes use with kemi framework by using value 1, because after module initialization the kemi framework is not ready, being set up per child process - reported by GH #1519 (cherry picked from commit 1b8ab8458806106a51de26afd06be5e3a15188b0) - URL: https://github.com/kamailio/kamailio/commit/1295aadf9055be1542b4436d84fd759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:02:26+02:00 htable: docs for event_callback_mode parameter (cherry picked from commit e72a41906da417cedb81ef8216c3c084fbb4902d) - URL: https://github.com/kamailio/kamailio/commit/75e29b91ebb54fc5ad3ce5ccbdc9230… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-05-09T12:02:41+02:00 Module: htable:: event_callback_mode to int (cherry picked from commit 896c5e1c76e6836bedaf66f9b832020a0d70c04b) - URL: https://github.com/kamailio/kamailio/commit/e4cca93ff255b391ae5c4cfedf3ccc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:02:52+02:00 core: rpc dns.view returns an array of records (cherry picked from commit 648dd937831654d40a9d615319693b87db31ef94) - URL: https://github.com/kamailio/kamailio/commit/04bd1288ba84223695c5e01e8f587fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:03:04+02:00 dispatcher: declare vars at beginning of the block in rpc command (cherry picked from commit c73a22abb1691e3c25b5f599e5f387540f152913) - URL: https://github.com/kamailio/kamailio/commit/ed235c5a5671fa9011e489e2ab1ff03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:03:40+02:00 core: rpc dns.view outputs proper formatted structure - previously it was doing sort of printf to emulate structures (cherry picked from commit ab9e9eba2bdd70a6bac296b88331a137c6a3cbd0) - URL: https://github.com/kamailio/kamailio/commit/e86116142f4c30ba5f9afbeebf55850… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:03:54+02:00 db_perlvdb: proper lookup for app_perl module - reported by shaheryarkh(a)gmail.com (cherry picked from commit 1226ae471627547ef00c651b78b37e1c397adc23) - URL: https://github.com/kamailio/kamailio/commit/7998b253bd6ed2e589f94d18a85aec9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:04:02+02:00 db_perlvdb: updated the db api exported fields (cherry picked from commit c7aa0a9e3796b1fcd70305a2878d62bf251a9b5e) - URL: https://github.com/kamailio/kamailio/commit/1cac068d1acdd44081a1c4e65a317a4… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-05-09T12:04:17+02:00 misc:kemi_lua append_hf to append (cherry picked from commit 5ceb3b857d448fed1e819812dcb4a9724243cdb8) - URL: https://github.com/kamailio/kamailio/commit/052cfbd844b662cac17910f55111ad8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:04:32+02:00 core: dns cache - print status as field in rpc structure (cherry picked from commit 1822d974ff1704cca3a1db5fce0507be47af3928) - URL: https://github.com/kamailio/kamailio/commit/fcd3974e85b549c85cb7fb3a11e9d01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:04:42+02:00 db_perlvdb: added const specifiers to get rid of warnings (cherry picked from commit 6a152024a40abdb89842aaee418088fe3fb23ae2) - URL: https://github.com/kamailio/kamailio/commit/256d06bc1902f59354fb0bee37a1e34… Author: uts09 <uttamhoode(a)gmail.com> Date: 2018-05-09T12:04:59+02:00 misc/examples/ims: replaced deprecated mi_fifo with jsonrpcs - submitted via PR #1524 (cherry picked from commit e17853d8804fa7f10688676d313014ac6e313215) - URL: https://github.com/kamailio/kamailio/commit/e5745ca3d058f82e957a761b4b800f8… Author: Muhammad Shahzad <shaheryarkh(a)gmail.com> Date: 2018-05-09T12:05:13+02:00 db_perlvdb: updated code and documentation for latest db api - GH #1525 (cherry picked from commit 1a15e985de8cc4a5c836dacd0df4afdb6b6efb1b)

1 0

git:master:066f0e8c: core: kemi - remove unused variable from method check helper
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: 066f0e8cdf19f35289772814c5dd6854691c92a3 URL: https://github.com/kamailio/kamailio/commit/066f0e8cdf19f35289772814c5dd685… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T10:45:39+02:00 core: kemi - remove unused variable from method check helper --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/066f0e8cdf19f35289772814c5dd685… Patch: https://github.com/kamailio/kamailio/commit/066f0e8cdf19f35289772814c5dd685… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 7c8e0a4056..5a07abb254 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -795,7 +795,6 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) static int sr_kemi_core_is_method_type(sip_msg_t *msg, int mtype) { int imethod; - int i; if(msg==NULL) { LM_WARN("invalid parameters\n");

1 0

git:master:3b3302e4: core: kemi - return bool for method test functions
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: 3b3302e4178f22dd3aa47406598ce20fa0748c31 URL: https://github.com/kamailio/kamailio/commit/3b3302e4178f22dd3aa47406598ce20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T10:44:07+02:00 core: kemi - return bool for method test functions --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3b3302e4178f22dd3aa47406598ce20… Patch: https://github.com/kamailio/kamailio/commit/3b3302e4178f22dd3aa47406598ce20… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index afe46321f6..7c8e0a4056 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1354,62 +1354,62 @@ static sr_kemi_t _sr_kemi_core[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_INVITE"), - SR_KEMIP_INT, sr_kemi_core_is_method_invite, + SR_KEMIP_BOOL, sr_kemi_core_is_method_invite, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_ACK"), - SR_KEMIP_INT, sr_kemi_core_is_method_ack, + SR_KEMIP_BOOL, sr_kemi_core_is_method_ack, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_BYE"), - SR_KEMIP_INT, sr_kemi_core_is_method_bye, + SR_KEMIP_BOOL, sr_kemi_core_is_method_bye, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_CANCEL"), - SR_KEMIP_INT, sr_kemi_core_is_method_cancel, + SR_KEMIP_BOOL, sr_kemi_core_is_method_cancel, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_REGISTER"), - SR_KEMIP_INT, sr_kemi_core_is_method_register, + SR_KEMIP_BOOL, sr_kemi_core_is_method_register, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_OPTIONS"), - SR_KEMIP_INT, sr_kemi_core_is_method_options, + SR_KEMIP_BOOL, sr_kemi_core_is_method_options, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_SUBSCRIBE"), - SR_KEMIP_INT, sr_kemi_core_is_method_subscribe, + SR_KEMIP_BOOL, sr_kemi_core_is_method_subscribe, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_PUBLISH"), - SR_KEMIP_INT, sr_kemi_core_is_method_publish, + SR_KEMIP_BOOL, sr_kemi_core_is_method_publish, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_NOTIFY"), - SR_KEMIP_INT, sr_kemi_core_is_method_notify, + SR_KEMIP_BOOL, sr_kemi_core_is_method_notify, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_INFO"), - SR_KEMIP_INT, sr_kemi_core_is_method_info, + SR_KEMIP_BOOL, sr_kemi_core_is_method_info, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_UPDATE"), - SR_KEMIP_INT, sr_kemi_core_is_method_update, + SR_KEMIP_BOOL, sr_kemi_core_is_method_update, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_PRACK"), - SR_KEMIP_INT, sr_kemi_core_is_method_prack, + SR_KEMIP_BOOL, sr_kemi_core_is_method_prack, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:7c912517: core: kemi - use uppercase method value in helper function names
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: 7c9125178b5b5d133919e0abc5bc687271783c5b URL: https://github.com/kamailio/kamailio/commit/7c9125178b5b5d133919e0abc5bc687… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T09:44:47+02:00 core: kemi - use uppercase method value in helper function names - better matching with how is in sip message --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7c9125178b5b5d133919e0abc5bc687… Patch: https://github.com/kamailio/kamailio/commit/7c9125178b5b5d133919e0abc5bc687… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 8ee9e1c91b..afe46321f6 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1353,62 +1353,62 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_invite"), + { str_init(""), str_init("is_INVITE"), SR_KEMIP_INT, sr_kemi_core_is_method_invite, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_ack"), + { str_init(""), str_init("is_ACK"), SR_KEMIP_INT, sr_kemi_core_is_method_ack, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_bye"), + { str_init(""), str_init("is_BYE"), SR_KEMIP_INT, sr_kemi_core_is_method_bye, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_cancel"), + { str_init(""), str_init("is_CANCEL"), SR_KEMIP_INT, sr_kemi_core_is_method_cancel, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_register"), + { str_init(""), str_init("is_REGISTER"), SR_KEMIP_INT, sr_kemi_core_is_method_register, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_options"), + { str_init(""), str_init("is_OPTIONS"), SR_KEMIP_INT, sr_kemi_core_is_method_options, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_subscribe"), + { str_init(""), str_init("is_SUBSCRIBE"), SR_KEMIP_INT, sr_kemi_core_is_method_subscribe, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_publish"), + { str_init(""), str_init("is_PUBLISH"), SR_KEMIP_INT, sr_kemi_core_is_method_publish, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_notify"), + { str_init(""), str_init("is_NOTIFY"), SR_KEMIP_INT, sr_kemi_core_is_method_notify, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_info"), + { str_init(""), str_init("is_INFO"), SR_KEMIP_INT, sr_kemi_core_is_method_info, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_update"), + { str_init(""), str_init("is_UPDATE"), SR_KEMIP_INT, sr_kemi_core_is_method_update, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_prack"), + { str_init(""), str_init("is_PRACK"), SR_KEMIP_INT, sr_kemi_core_is_method_prack, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

1 0

git:master:e6eabea9: corex: exported kemi function to test if user-agend header is set
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: e6eabea9e7806a708b0af8a45b7390eceb51dfdb URL: https://github.com/kamailio/kamailio/commit/e6eabea9e7806a708b0af8a45b7390e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T09:23:07+02:00 corex: exported kemi function to test if user-agend header is set - KSR.has_user_agent() - return 1 if User-Agent has value; -1 otherwise --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e6eabea9e7806a708b0af8a45b7390e… Patch: https://github.com/kamailio/kamailio/commit/e6eabea9e7806a708b0af8a45b7390e… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 6d6b03da29..b86876a191 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -751,7 +751,7 @@ static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *s2) } /** - * + * */ static int ki_has_ruri_user(sip_msg_t *msg) { @@ -773,6 +773,28 @@ static int ki_has_ruri_user(sip_msg_t *msg) return -1; } +/** + * + */ +static int ki_has_user_agent(sip_msg_t *msg) +{ + if(msg==NULL) + return -1; + + if(msg->user_agent==NULL && ((parse_headers(msg, HDR_USERAGENT_F, 0)==-1) + || (msg->user_agent==NULL))) + { + LM_DBG("no User-Agent header\n"); + return -1; + } + + if(msg->user_agent->body.s!=NULL && msg->user_agent->body.len>0) { + return 1; + } + + return -1; +} + /** * */ @@ -838,6 +860,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("has_user_agent"), + SR_KEMIP_INT, ki_has_user_agent, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:dabcabd3: corex: exported helper function to check if RURI has user field
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: dabcabd3025c2a8988379a40ca65c56fe9b2838b URL: https://github.com/kamailio/kamailio/commit/dabcabd3025c2a8988379a40ca65c56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T09:07:49+02:00 corex: exported helper function to check if RURI has user field - KSR.has_ruri_user() - return 1 if user field is set, -1 otherwise --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dabcabd3025c2a8988379a40ca65c56… Patch: https://github.com/kamailio/kamailio/commit/dabcabd3025c2a8988379a40ca65c56… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 0d7ce35857..6d6b03da29 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -30,6 +30,7 @@ #include "../../core/lvalue.h" #include "../../core/pvar.h" #include "../../core/kemi.h" +#include "../../core/parser/parse_uri.h" #include "corex_lib.h" #include "corex_rpc.h" @@ -749,6 +750,29 @@ static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *s2) return ki_via_add_xavp_params(msg, fval); } +/** + * + */ +static int ki_has_ruri_user(sip_msg_t *msg) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REPLY) /* REPLY doesnt have a ruri */ + return -1; + + if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ && parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse the R-URI\n"); + return -1; + } + + if(msg->parsed_uri.user.s!=NULL && msg->parsed_uri.user.len>0) { + return 1; + } + + return -1; +} + /** * */ @@ -809,6 +833,12 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("has_ruri_user"), + SR_KEMIP_INT, ki_has_ruri_user, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

1 0

git:master:d63638d4: core: exported helper functions to match on specific sip methods
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: d63638d44dc3959cf387a57eb9ce1004153e6030 URL: https://github.com/kamailio/kamailio/commit/d63638d44dc3959cf387a57eb9ce100… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T08:55:02+02:00 core: exported helper functions to match on specific sip methods - useful to make the kemi script easier to follow --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/d63638d44dc3959cf387a57eb9ce100… Patch: https://github.com/kamailio/kamailio/commit/d63638d44dc3959cf387a57eb9ce100…

1 0

git:master:e4f6a39b: core: kemi - exported is_myself_suri()
by Daniel-Constantin Mierla 08 May '18

08 May '18

Module: kamailio Branch: master Commit: e4f6a39b08cb6fb8bb40c635ebafc7795a239e3c URL: https://github.com/kamailio/kamailio/commit/e4f6a39b08cb6fb8bb40c635ebafc77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-08T22:48:47+02:00 core: kemi - exported is_myself_suri() - return true if the source address is matching myself (useful to detect when sending to itself) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e4f6a39b08cb6fb8bb40c635ebafc77… Patch: https://github.com/kamailio/kamailio/commit/e4f6a39b08cb6fb8bb40c635ebafc77… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 0ff1c48152..bb671f1e60 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -235,6 +235,21 @@ static int sr_kemi_core_is_myself_turi(sip_msg_t *msg) return sr_kemi_core_is_myself(msg, &xto->uri); } +/** + * + */ +static int sr_kemi_core_is_myself_suri(sip_msg_t *msg) +{ + str suri; + + if(get_src_uri(msg, 0, &suri)<0) { + LM_ERR("cannot src address uri\n"); + return SR_KEMI_FALSE; + } + + return sr_kemi_core_is_myself(msg, &suri); +} + /** * */ @@ -1047,6 +1062,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_myself_suri"), + SR_KEMIP_BOOL, sr_kemi_core_is_myself_suri, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("setflag"), SR_KEMIP_BOOL, sr_kemi_core_setflag, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:bbef7d81: core: kemi - support for MESSAGE in is_method_in()
by Daniel-Constantin Mierla 08 May '18

08 May '18

Module: kamailio Branch: master Commit: bbef7d81e94a7cc048620571cd2f324184dbb5e9 URL: https://github.com/kamailio/kamailio/commit/bbef7d81e94a7cc048620571cd2f324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-08T22:44:16+02:00 core: kemi - support for MESSAGE in is_method_in() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/bbef7d81e94a7cc048620571cd2f324… Patch: https://github.com/kamailio/kamailio/commit/bbef7d81e94a7cc048620571cd2f324… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index a3922cae91..0ff1c48152 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -733,6 +733,12 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'M': + case 'm': + if(imethod==METHOD_MESSAGE) { + return SR_KEMI_TRUE; + } + break; case 'R': case 'r': if(imethod==METHOD_REGISTER) {

1 0

git:master:bcacfa0c: modules: readme files regenerated - db_perlvdb ... [skip ci]
by Kamailio Dev 08 May '18

08 May '18

Module: kamailio Branch: master Commit: bcacfa0cf139e26b6f56a73b3d6cdf8c1a395210 URL: https://github.com/kamailio/kamailio/commit/bcacfa0cf139e26b6f56a73b3d6cdf8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-08T08:32:08+02:00 modules: readme files regenerated - db_perlvdb ... [skip ci] --- Modified: src/modules/db_perlvdb/README --- Diff: https://github.com/kamailio/kamailio/commit/bcacfa0cf139e26b6f56a73b3d6cdf8… Patch: https://github.com/kamailio/kamailio/commit/bcacfa0cf139e26b6f56a73b3d6cdf8… --- diff --git a/src/modules/db_perlvdb/README b/src/modules/db_perlvdb/README index ba746b7bd0..759dbae9f0 100644 --- a/src/modules/db_perlvdb/README +++ b/src/modules/db_perlvdb/README @@ -69,12 +69,12 @@ Chapter 1. Admin Guide database access. Relaying of insert, update, query and delete operations is supported. - Modules can be configured to use the perlvdb module as database backend - using the db_url_parameter: + Modules can be configured to use the db_perlvdb module as database + backend using the db_url_parameter: modparam("acc", "db_url", "perlvdb:Kamailio::VDB::Adapter::AccountingSIPtrace") This configuration options tells acc module that it should use the - perlvdb module which will in turn use the Perl class + db_perlvdb module which will in turn use the Perl class Kamailio::VDB::Adapter::AccountingSIPtrace to relay the database requests. @@ -86,13 +86,14 @@ modparam("acc", "db_url", "perlvdb:Kamailio::VDB::Adapter::AccountingSIPtrace") 2.1. Kamailio Modules The following modules must be loaded before this module: - * perl -- Perl module + * app_perl -- Perl Application module 2.2. External Libraries or Applications The following libraries or applications must be installed before running Kamailio with this module loaded: - * None (Besides the ones mentioned in the perl module documentation). + * None (Besides the ones mentioned in the app_perl module + documentation). 3. Parameters @@ -136,7 +137,7 @@ Chapter 2. Developer Guide 2. Base class Kamailio::VDB - A client module has to be configured to use the perlvdb module in + A client module has to be configured to use the db_perlvdb module in conjunction with a Perl class to provide the functions. The configured class needs to inherit from the base class Kamailio::VDB.

1 0

[kamailio/kamailio] Updated db_perlvdb module code and documentation to be compliant with new database API. (#1525)
by Muhammad Shahzad Shafi 08 May '18

08 May '18

Updated db_perlvdb module code and documentation to be compliant with new database API.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1525 -- Commit Summary -- * Updated db_perlvdb module code and documentation to be compliant with new database API. -- File Changes -- M src/modules/db_perlvdb/db_perlvdb.c (4) M src/modules/db_perlvdb/doc/db_perlvdb_admin.xml (8) M src/modules/db_perlvdb/doc/db_perlvdb_devel.xml (2) M src/modules/db_perlvdb/perlvdb_conv.c (14) M src/modules/db_perlvdb/perlvdb_conv.h (4) M src/modules/db_perlvdb/perlvdbfunc.c (2) M src/modules/db_perlvdb/perlvdbfunc.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1525.patch https://github.com/kamailio/kamailio/pull/1525.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/1525

3 3

git:master:1a15e985: db_perlvdb: updated code and documentation for latest db api
by Daniel-Constantin Mierla 08 May '18

08 May '18

Module: kamailio Branch: master Commit: 1a15e985de8cc4a5c836dacd0df4afdb6b6efb1b URL: https://github.com/kamailio/kamailio/commit/1a15e985de8cc4a5c836dacd0df4afd… Author: Muhammad Shahzad <shaheryarkh(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-08T08:15:47+02:00 db_perlvdb: updated code and documentation for latest db api - GH #1525 --- Modified: src/modules/db_perlvdb/db_perlvdb.c Modified: src/modules/db_perlvdb/doc/db_perlvdb_admin.xml Modified: src/modules/db_perlvdb/doc/db_perlvdb_devel.xml Modified: src/modules/db_perlvdb/perlvdb_conv.c Modified: src/modules/db_perlvdb/perlvdb_conv.h Modified: src/modules/db_perlvdb/perlvdbfunc.c Modified: src/modules/db_perlvdb/perlvdbfunc.h --- Diff: https://github.com/kamailio/kamailio/commit/1a15e985de8cc4a5c836dacd0df4afd… Patch: https://github.com/kamailio/kamailio/commit/1a15e985de8cc4a5c836dacd0df4afd…

1 0

Problem load db_perlvdb.so module
by M S 07 May '18

07 May '18

Hi, I am trying to load db_perlvdb.so module using latest Kamailio branch v5.0.6 with git revision 49bd81ad7856dac9b2efd53597fb1c182de7440b on Debian Wheezy 32bit. The compilation and installation went successful however the module gives following error. -- May 4 19:03:59 webrtc[8895]: INFO: app_perl [app_perl_mod.c:351]: mod_init(): perl interpreter has been initialized (1525453439.237584 => 1525453439.454432) May 4 19:03:59 webrtc[8895]: CRITICAL: db_perlvdb [db_perlvdb.c:79]: mod_init(): perl module not loaded. Exiting. May 4 19:03:59 webrtc[8895]: ERROR: <core> [core/sr_module.c:970]: init_mod(): Error while initializing module db_perlvdb (/usr/local/adx-webrtc/lib/kamailio/modules/db_perlvdb.so) -- I tried to find module perl.so in modules folder of kamailio installation but there is none. Then i looked through the source code but no success. After some googling, i found following link which states that perl.so was remained to app_perl.so since v4.x. I have created a small patch for db_perlvdb.c which corrects this error. -- diff --git a/src/modules/db_perlvdb/db_perlvdb.c b/src/modules/db_perlvdb/db_perlvdb.c index 7a2b63e..266ece2 100644 --- a/src/modules/db_perlvdb/db_perlvdb.c +++ b/src/modules/db_perlvdb/db_perlvdb.c @@ -75,8 +75,8 @@ struct module_exports exports = { static int mod_init(void) { - if (!module_loaded("perl")) { - LM_CRIT("perl module not loaded. Exiting.\n"); + if (!module_loaded("app_perl")) { + LM_CRIT("app_perl module not loaded. Exiting.\n"); return -1; } -- Kindly update Kamailio master and branch trunks. Thank you.

3 10

[kamailio/kamailio] examples: Removed mi_fifo.so/mi_rpc.so modules (Deprecated in 5.X) and added jsonrpcs.so. (#1524)
by uts09 07 May '18

07 May '18

#### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  mi_fifo.so and mi_rpc.so modules are deprecated in v5.0 release and jsonrpcs.so has been introduced. Source: [https://www.kamailio.org/wiki/install/upgrade/4.4.x-to-5.0.0](url) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1524 -- Commit Summary -- * Update kamailio.cfg * Update kamailio.cfg * Update kamailio.cfg -- File Changes -- M misc/examples/ims/icscf/kamailio.cfg (14) M misc/examples/ims/pcscf/kamailio.cfg (16) M misc/examples/ims/scscf/kamailio.cfg (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1524.patch https://github.com/kamailio/kamailio/pull/1524.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/1524

2 2

git:master:e17853d8: misc/examples/ims: replaced deprecated mi_fifo with jsonrpcs
by Daniel-Constantin Mierla 07 May '18

07 May '18

Module: kamailio Branch: master Commit: e17853d8804fa7f10688676d313014ac6e313215 URL: https://github.com/kamailio/kamailio/commit/e17853d8804fa7f10688676d313014a… Author: uts09 <uttamhoode(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-07T22:30:04+02:00 misc/examples/ims: replaced deprecated mi_fifo with jsonrpcs - submitted via PR #1524 --- Modified: misc/examples/ims/icscf/kamailio.cfg Modified: misc/examples/ims/pcscf/kamailio.cfg Modified: misc/examples/ims/scscf/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e17853d8804fa7f10688676d313014a… Patch: https://github.com/kamailio/kamailio/commit/e17853d8804fa7f10688676d313014a… --- diff --git a/misc/examples/ims/icscf/kamailio.cfg b/misc/examples/ims/icscf/kamailio.cfg index c694074c05..27fc8234f9 100644 --- a/misc/examples/ims/icscf/kamailio.cfg +++ b/misc/examples/ims/icscf/kamailio.cfg @@ -102,8 +102,6 @@ loadmodule "corex" # Control interfaces: loadmodule "ctl" loadmodule "cfg_rpc" -loadmodule "mi_rpc" -loadmodule "mi_fifo" #!ifdef WITH_XMLRPC loadmodule "xmlrpc" #!endif @@ -144,11 +142,13 @@ modparam("db_cluster", "connection", DB_URL2) modparam("db_cluster", "cluster", "cluster1=>con1=2s2s;con2=1s1s") #!endif -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") +loadmodule "jsonrpcs.so" +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # -- rr params -- # add value to ;lr param to make some broken UAs happy diff --git a/misc/examples/ims/pcscf/kamailio.cfg b/misc/examples/ims/pcscf/kamailio.cfg index aaa1fa894d..8502ce6dc0 100644 --- a/misc/examples/ims/pcscf/kamailio.cfg +++ b/misc/examples/ims/pcscf/kamailio.cfg @@ -152,9 +152,7 @@ loadmodule "textopsx" loadmodule "siputils" loadmodule "sanity" loadmodule "ctl" -loadmodule "mi_rpc" loadmodule "cfg_rpc" -loadmodule "mi_fifo" loadmodule "xlog" loadmodule "auth" loadmodule "dispatcher" @@ -237,11 +235,13 @@ modparam("debugger", "mod_level", "rtpengine=3") modparam("debugger", "cfgtrace", 1) #!endif -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") +loadmodule "jsonrpcs.so" +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # ----------------- setting module-specific parameters --------------- #!ifdef DB_URL2 @@ -905,5 +905,3 @@ include_file "route/register.cfg" include_file "route/rtp.cfg" include_file "route/mo.cfg" include_file "route/mt.cfg" - - diff --git a/misc/examples/ims/scscf/kamailio.cfg b/misc/examples/ims/scscf/kamailio.cfg index 9d06af488c..97edf14350 100644 --- a/misc/examples/ims/scscf/kamailio.cfg +++ b/misc/examples/ims/scscf/kamailio.cfg @@ -135,8 +135,6 @@ loadmodule "uac" # Control interfaces: loadmodule "ctl" loadmodule "cfg_rpc" -loadmodule "mi_rpc" -loadmodule "mi_fifo" #!ifdef WITH_XMLRPC loadmodule "xmlrpc" #!endif @@ -188,17 +186,13 @@ modparam("presence", "db_url", DB_URL) modparam("presence", "db_update_period", 20) #!endif -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") - -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") -modparam("mi_fifo", "fifo_mode", 0666) -modparam("mi_fifo", "fifo_user", "kamailio") -modparam("mi_fifo", "fifo_group", "kamailio") +loadmodule "jsonrpcs.so" +# ----- jsonrpcs params ----- +modparam("jsonrpcs", "pretty_format", 1) +/* set the path to RPC fifo control file */ +# modparam("jsonrpcs", "fifo_name", "/var/run/kamailio/kamailio_rpc.fifo") +/* set the path to RPC unix socket control file */ +# modparam("jsonrpcs", "dgram_socket", "/var/run/kamailio/kamailio_rpc.sock") # ----- ctl params ----- modparam("ctl", "binrpc", "unix:/var/run/kamailio_scscf/kamailio_ctl") @@ -1227,4 +1221,3 @@ failure_route[PSTN_failure] { exit; } } -

1 0

git:5.1:03dd5924: core: improve to header check guards, str consists of length and pointer
by Henning Westerholt 07 May '18

07 May '18

Module: kamailio Branch: 5.1 Commit: 03dd59249d17c55c749d4a4e806843f7f407e4ea URL: https://github.com/kamailio/kamailio/commit/03dd59249d17c55c749d4a4e806843f… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-07T20:20:49+02:00 core: improve to header check guards, str consists of length and pointer (cherry picked from commit 281a6c6b6eaaf30058b603325e8ded20b99e1456) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/03dd59249d17c55c749d4a4e806843f… Patch: https://github.com/kamailio/kamailio/commit/03dd59249d17c55c749d4a4e806843f… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index ca0f9fa521..201e3a5e1d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2367,7 +2367,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, case HDR_TO_T: if (new_tag && new_tag->len) { to_tag=get_to(msg)->tag_value; - if ( to_tag.len || to_tag.s ) + if ( to_tag.len && to_tag.s ) len+=new_tag->len-to_tag.len; else len+=new_tag->len+TOTAG_TOKEN_LEN/*";tag="*/; @@ -2495,7 +2495,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, break; case HDR_TO_T: if (new_tag && new_tag->len){ - if (to_tag.s ) { /* replacement */ + if (to_tag.len && to_tag.s) { /* replacement */ /* before to-tag */ append_str( p, hdr->name.s, to_tag.s-hdr->name.s); /* to tag replacement */

1 0

git:5.0:73125bd9: core: improve to header check guards, str consists of length and pointer
by Henning Westerholt 07 May '18

07 May '18

Module: kamailio Branch: 5.0 Commit: 73125bd9cc191b8fba779fa7e0386f4e5a1941c5 URL: https://github.com/kamailio/kamailio/commit/73125bd9cc191b8fba779fa7e0386f4… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-07T20:20:02+02:00 core: improve to header check guards, str consists of length and pointer (cherry picked from commit 281a6c6b6eaaf30058b603325e8ded20b99e1456) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/73125bd9cc191b8fba779fa7e0386f4… Patch: https://github.com/kamailio/kamailio/commit/73125bd9cc191b8fba779fa7e0386f4… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index ca0f9fa521..201e3a5e1d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2367,7 +2367,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, case HDR_TO_T: if (new_tag && new_tag->len) { to_tag=get_to(msg)->tag_value; - if ( to_tag.len || to_tag.s ) + if ( to_tag.len && to_tag.s ) len+=new_tag->len-to_tag.len; else len+=new_tag->len+TOTAG_TOKEN_LEN/*";tag="*/; @@ -2495,7 +2495,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, break; case HDR_TO_T: if (new_tag && new_tag->len){ - if (to_tag.s ) { /* replacement */ + if (to_tag.len && to_tag.s) { /* replacement */ /* before to-tag */ append_str( p, hdr->name.s, to_tag.s-hdr->name.s); /* to tag replacement */

1 0

git:master:281a6c6b: core: improve to header check guards, str consists of length and pointer
by Henning Westerholt 07 May '18

07 May '18

Module: kamailio Branch: master Commit: 281a6c6b6eaaf30058b603325e8ded20b99e1456 URL: https://github.com/kamailio/kamailio/commit/281a6c6b6eaaf30058b603325e8ded2… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-07T09:36:53+02:00 core: improve to header check guards, str consists of length and pointer --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/281a6c6b6eaaf30058b603325e8ded2… Patch: https://github.com/kamailio/kamailio/commit/281a6c6b6eaaf30058b603325e8ded2… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 22122768a1..4dd648e874 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2369,7 +2369,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, case HDR_TO_T: if (new_tag && new_tag->len) { to_tag=get_to(msg)->tag_value; - if ( to_tag.len || to_tag.s ) + if ( to_tag.len && to_tag.s ) len+=new_tag->len-to_tag.len; else len+=new_tag->len+TOTAG_TOKEN_LEN/*";tag="*/; @@ -2497,7 +2497,7 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, break; case HDR_TO_T: if (new_tag && new_tag->len){ - if (to_tag.s ) { /* replacement */ + if (to_tag.len && to_tag.s) { /* replacement */ /* before to-tag */ append_str( p, hdr->name.s, to_tag.s-hdr->name.s); /* to tag replacement */

1 0

git:master:5ef91a63: core: improve existing DBG message, also output to tag
by Henning Westerholt 07 May '18

07 May '18

Module: kamailio Branch: master Commit: 5ef91a63b8cd83daf51f195171f3ccbb14f02e6e URL: https://github.com/kamailio/kamailio/commit/5ef91a63b8cd83daf51f195171f3ccb… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-07T09:39:08+02:00 core: improve existing DBG message, also output to tag --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/5ef91a63b8cd83daf51f195171f3ccb… Patch: https://github.com/kamailio/kamailio/commit/5ef91a63b8cd83daf51f195171f3ccb… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 2a3d3b1de5..0420dcd172 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -169,7 +169,7 @@ char* get_hdr_field(char* const buf, char* const end, struct hdr_field* const hd hdr->body.len=tmp-hdr->body.s; DBG("<%.*s> [%d]; uri=[%.*s]\n", hdr->name.len, ZSW(hdr->name.s), hdr->body.len, to_b->uri.len, ZSW(to_b->uri.s)); - DBG("to body [%.*s]\n", to_b->body.len, ZSW(to_b->body.s)); + DBG("to body [%.*s], to tag [%.*s]\n", to_b->body.len, ZSW(to_b->body.s), to_b->tag_value.len, ZSW(to_b->tag_value.s)); break; case HDR_CONTENTLENGTH_T: hdr->body.s=tmp;

1 0

git:master:6a152024: db_perlvdb: added const specifiers to get rid of warnings
by Daniel-Constantin Mierla 07 May '18

07 May '18

Module: kamailio Branch: master Commit: 6a152024a40abdb89842aaee418088fe3fb23ae2 URL: https://github.com/kamailio/kamailio/commit/6a152024a40abdb89842aaee418088f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-07T08:55:46+02:00 db_perlvdb: added const specifiers to get rid of warnings --- Modified: src/modules/db_perlvdb/perlvdb_conv.c Modified: src/modules/db_perlvdb/perlvdb_conv.h Modified: src/modules/db_perlvdb/perlvdbfunc.c --- Diff: https://github.com/kamailio/kamailio/commit/6a152024a40abdb89842aaee418088f… Patch: https://github.com/kamailio/kamailio/commit/6a152024a40abdb89842aaee418088f… --- diff --git a/src/modules/db_perlvdb/perlvdb_conv.c b/src/modules/db_perlvdb/perlvdb_conv.c index c3f1e6800b..5c1c33ddfd 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.c +++ b/src/modules/db_perlvdb/perlvdb_conv.c @@ -33,7 +33,7 @@ /* Converts a set of pairs to perl SVs. * For insert, and update (second half) */ -AV *pairs2perlarray(db_key_t* keys, db_val_t* vals, int n) { +AV *pairs2perlarray(const db_key_t* keys, const db_val_t* vals, const int n) { AV *array = newAV(); SV *element; @@ -50,7 +50,7 @@ AV *pairs2perlarray(db_key_t* keys, db_val_t* vals, int n) { /* Converts a set of cond's to perl SVs. * For delete, update (first half), query */ -AV *conds2perlarray(db_key_t* keys, db_op_t* ops, db_val_t* vals, int n) { +AV *conds2perlarray(const db_key_t* keys, const db_op_t* ops, const db_val_t* vals, const int n) { AV *array = newAV(); SV *element = NULL; int i = 0; @@ -80,7 +80,7 @@ AV *conds2perlarray(db_key_t* keys, db_op_t* ops, db_val_t* vals, int n) { /* Converts a set of key names to a perl array. * Needed in query. */ -AV *keys2perlarray(db_key_t* keys, int n) { +AV *keys2perlarray(const db_key_t* keys, const int n) { AV *array = newAV(); SV *element; int i; @@ -92,7 +92,7 @@ AV *keys2perlarray(db_key_t* keys, int n) { return array; } -SV *valdata(db_val_t* val) { +SV *valdata(const db_val_t* val) { SV *data = &PL_sv_undef; const char* stringval; @@ -167,7 +167,7 @@ SV *val2perlval(db_val_t* val) { } -SV *pair2perlpair(db_key_t key, db_val_t* val) { +SV *pair2perlpair(db_key_t key, const db_val_t* val) { SV* retval; SV *class; @@ -190,7 +190,7 @@ SV *pair2perlpair(db_key_t key, db_val_t* val) { } -SV *cond2perlcond(db_key_t key, db_op_t op, db_val_t* val) { +SV *cond2perlcond(const db_key_t key, const db_op_t op, const db_val_t* val) { SV* retval; SV *class; diff --git a/src/modules/db_perlvdb/perlvdb_conv.h b/src/modules/db_perlvdb/perlvdb_conv.h index 9018305a22..96666f90c5 100644 --- a/src/modules/db_perlvdb/perlvdb_conv.h +++ b/src/modules/db_perlvdb/perlvdb_conv.h @@ -44,21 +44,21 @@ /* Converts a set of pairs to perl SVs. * For insert, and update (second half) */ -AV *pairs2perlarray(db_key_t* keys, db_val_t* vals, int n); +AV *pairs2perlarray(const db_key_t* keys, const db_val_t* vals, const int n); /* Converts a set of cond's to perl SVs. * For delete, update (first half), query */ -AV *conds2perlarray(db_key_t* keys, db_op_t* ops, db_val_t* vals, int n); +AV *conds2perlarray(const db_key_t* keys, const db_op_t* ops, const db_val_t* vals, const int n); /* Converts a set of key names to a perl array. * Needed in query. */ -AV *keys2perlarray(db_key_t* keys, int n); +AV *keys2perlarray(const db_key_t* keys, const int n); SV *val2perlval(db_val_t* val); -SV *pair2perlpair(db_key_t key, db_val_t* val); -SV *cond2perlcond(db_key_t key, db_op_t op, db_val_t* val); +SV *pair2perlpair(db_key_t key, const db_val_t* val); +SV *cond2perlcond(const db_key_t key, const db_op_t op, const db_val_t* val); int perlresult2dbres(SV *perlres, db1_res_t **r); diff --git a/src/modules/db_perlvdb/perlvdbfunc.c b/src/modules/db_perlvdb/perlvdbfunc.c index 73a7b1c9dd..7518fcdac5 100644 --- a/src/modules/db_perlvdb/perlvdbfunc.c +++ b/src/modules/db_perlvdb/perlvdbfunc.c @@ -76,7 +76,7 @@ SV *newvdbobj(const char* cn) { return obj; } -SV *getobj(db1_con_t *con) { +SV *getobj(const db1_con_t *con) { return ((SV*)CON_TAIL(con)); } @@ -179,8 +179,8 @@ void perlvdb_db_close(db1_con_t* h) { * v: values of the keys * n: number of key=value pairs */ -int perlvdb_db_insertreplace(db1_con_t* h, db_key_t* k, db_val_t* v, - int n, char *insertreplace) { +int perlvdb_db_insertreplace(const db1_con_t* h, const db_key_t* k, const db_val_t* v, + const int n, char *insertreplace) { AV *arr; SV *arrref; SV *ret;

1 0

git:master:1822d974: core: dns cache - print status as field in rpc structure
by Daniel-Constantin Mierla 06 May '18

06 May '18

Module: kamailio Branch: master Commit: 1822d974ff1704cca3a1db5fce0507be47af3928 URL: https://github.com/kamailio/kamailio/commit/1822d974ff1704cca3a1db5fce0507b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-06T22:52:46+02:00 core: dns cache - print status as field in rpc structure --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/1822d974ff1704cca3a1db5fce0507b… Patch: https://github.com/kamailio/kamailio/commit/1822d974ff1704cca3a1db5fce0507b… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 88c0ae244f..908c378aad 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -4030,24 +4030,44 @@ void dns_cache_flush(int del_permanent) /* deletes all the non-permanent entries from the cache */ void dns_cache_delete_all(rpc_t* rpc, void* ctx) { + void *th; + if (!cfg_get(core, core_cfg, use_dns_cache)){ rpc->fault(ctx, 500, "dns cache support disabled (see use_dns_cache)"); return; } dns_cache_flush(0); - rpc->rpl_printf(ctx, "OK"); + + if(rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error - root structure"); + return; + } + if(rpc->struct_add(th, "s", "status", "ok") < 0) { + rpc->fault(ctx, 500, "Internal error - status"); + return; + } } /* deletes all the entries from the cache, * even the permanent ones */ void dns_cache_delete_all_force(rpc_t* rpc, void* ctx) { + void *th; + if (!cfg_get(core, core_cfg, use_dns_cache)){ rpc->fault(ctx, 500, "dns cache support disabled (see use_dns_cache)"); return; } dns_cache_flush(1); - rpc->rpl_printf(ctx, "OK"); + + if(rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error - root structure"); + return; + } + if(rpc->struct_add(th, "s", "status", "ok") < 0) { + rpc->fault(ctx, 500, "Internal error - status"); + return; + } } /* clones an entry and extends its memory area to hold a new rr.

1 0

git:master:eb218806: tm: remove unused 'ret' variable in w_t_reply, compiler warning
by Henning Westerholt 06 May '18

06 May '18

Module: kamailio Branch: master Commit: eb218806e5a1143eca2ce51741859c7ac7505f4b URL: https://github.com/kamailio/kamailio/commit/eb218806e5a1143eca2ce51741859c7… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-05-06T18:47:14+02:00 tm: remove unused 'ret' variable in w_t_reply, compiler warning --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/eb218806e5a1143eca2ce51741859c7… Patch: https://github.com/kamailio/kamailio/commit/eb218806e5a1143eca2ce51741859c7… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index f264a0b781..426898f314 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1373,7 +1373,7 @@ static int ki_t_reply(sip_msg_t* msg, int code, str* reason) static int w_t_reply(struct sip_msg* msg, char* p1, char* p2) { - int code, ret = -1; + int code; str reason; if (msg->REQ_METHOD==METHOD_ACK) {

1 0

git:master:b4a837ca: Merge pull request #1523 from surendratiwari3/kamailio_lua_config_append_hf
by GitHub 05 May '18

05 May '18

Module: kamailio Branch: master Commit: b4a837ca0f3426ca30e7f51a6c21113462f3463e URL: https://github.com/kamailio/kamailio/commit/b4a837ca0f3426ca30e7f51a6c21113… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-05-05T09:37:27+02:00 Merge pull request #1523 from surendratiwari3/kamailio_lua_config_append_hf misc:kemi_lua append_hf to append --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/b4a837ca0f3426ca30e7f51a6c21113… Patch: https://github.com/kamailio/kamailio/commit/b4a837ca0f3426ca30e7f51a6c21113… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index ed973f171b..295d502aa1 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -325,7 +325,7 @@ end function ksr_route_sipout() if KSR.is_myself(KSR.pv.get("$ru")) then return 1; end - KSR.hdr.append_hf("P-Hint: outbound\r\n"); + KSR.hdr.append("P-Hint: outbound\r\n"); ksr_route_relay(); KSR.x.exit(); end

1 0

[kamailio/kamailio] misc:kemi_lua append_hf to append (#1523)
by Surendra Tiwari 05 May '18

05 May '18

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

2 1

git:master:5ceb3b85: misc:kemi_lua append_hf to append
by surendratiwari3 05 May '18

05 May '18

Module: kamailio Branch: master Commit: 5ceb3b857d448fed1e819812dcb4a9724243cdb8 URL: https://github.com/kamailio/kamailio/commit/5ceb3b857d448fed1e819812dcb4a97… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Committer: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-05-05T12:48:31+05:30 misc:kemi_lua append_hf to append --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/5ceb3b857d448fed1e819812dcb4a97… Patch: https://github.com/kamailio/kamailio/commit/5ceb3b857d448fed1e819812dcb4a97… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index ed973f171b..295d502aa1 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -325,7 +325,7 @@ end function ksr_route_sipout() if KSR.is_myself(KSR.pv.get("$ru")) then return 1; end - KSR.hdr.append_hf("P-Hint: outbound\r\n"); + KSR.hdr.append("P-Hint: outbound\r\n"); ksr_route_relay(); KSR.x.exit(); end

1 0

git:master:c7aa0a9e: db_perlvdb: updated the db api exported fields
by Daniel-Constantin Mierla 05 May '18

05 May '18

Module: kamailio Branch: master Commit: c7aa0a9e3796b1fcd70305a2878d62bf251a9b5e URL: https://github.com/kamailio/kamailio/commit/c7aa0a9e3796b1fcd70305a2878d62b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-05T09:21:14+02:00 db_perlvdb: updated the db api exported fields --- Modified: src/modules/db_perlvdb/db_perlvdb.c Modified: src/modules/db_perlvdb/perlvdbfunc.c Modified: src/modules/db_perlvdb/perlvdbfunc.h --- Diff: https://github.com/kamailio/kamailio/commit/c7aa0a9e3796b1fcd70305a2878d62b… Patch: https://github.com/kamailio/kamailio/commit/c7aa0a9e3796b1fcd70305a2878d62b…

1 0

git:master:1226ae47: db_perlvdb: proper lookup for app_perl module
by Daniel-Constantin Mierla 05 May '18

05 May '18

Module: kamailio Branch: master Commit: 1226ae471627547ef00c651b78b37e1c397adc23 URL: https://github.com/kamailio/kamailio/commit/1226ae471627547ef00c651b78b37e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-05T08:49:32+02:00 db_perlvdb: proper lookup for app_perl module - reported by shaheryarkh(a)gmail.com --- Modified: src/modules/db_perlvdb/db_perlvdb.c --- Diff: https://github.com/kamailio/kamailio/commit/1226ae471627547ef00c651b78b37e1… Patch: https://github.com/kamailio/kamailio/commit/1226ae471627547ef00c651b78b37e1… --- diff --git a/src/modules/db_perlvdb/db_perlvdb.c b/src/modules/db_perlvdb/db_perlvdb.c index 7a2b63e434..266ece2fc5 100644 --- a/src/modules/db_perlvdb/db_perlvdb.c +++ b/src/modules/db_perlvdb/db_perlvdb.c @@ -75,8 +75,8 @@ struct module_exports exports = { static int mod_init(void) { - if (!module_loaded("perl")) { - LM_CRIT("perl module not loaded. Exiting.\n"); + if (!module_loaded("app_perl")) { + LM_CRIT("app_perl module not loaded. Exiting.\n"); return -1; }

1 0

git:master:ab9e9eba: core: rpc dns.view outputs proper formatted structure
by Daniel-Constantin Mierla 05 May '18

05 May '18

Module: kamailio Branch: master Commit: ab9e9eba2bdd70a6bac296b88331a137c6a3cbd0 URL: https://github.com/kamailio/kamailio/commit/ab9e9eba2bdd70a6bac296b88331a13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-05T08:44:41+02:00 core: rpc dns.view outputs proper formatted structure - previously it was doing sort of printf to emulate structures --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/ab9e9eba2bdd70a6bac296b88331a13… Patch: https://github.com/kamailio/kamailio/commit/ab9e9eba2bdd70a6bac296b88331a13…

1 0

git:master:c73a22ab: dispatcher: declare vars at beginning of the block in rpc command
by Daniel-Constantin Mierla 05 May '18

05 May '18

Module: kamailio Branch: master Commit: c73a22abb1691e3c25b5f599e5f387540f152913 URL: https://github.com/kamailio/kamailio/commit/c73a22abb1691e3c25b5f599e5f3875… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-05T07:36:56+02:00 dispatcher: declare vars at beginning of the block in rpc command --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/c73a22abb1691e3c25b5f599e5f3875… Patch: https://github.com/kamailio/kamailio/commit/c73a22abb1691e3c25b5f599e5f3875… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 2c1e6fdbd0..f6ab6b1d70 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1275,16 +1275,7 @@ static const char *dispatcher_rpc_list_doc[2] = { */ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) { - if(!node) - return 0; - int i = 0, rc = 0; - for(; i < 2; ++i) { - rc = ds_rpc_print_set(node->next[i], rpc, ctx, rpc_handle); - if(rc != 0) - return rc; - } - void *rh; void *sh; void *vh; @@ -1294,6 +1285,15 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) char c[3]; str data = STR_NULL; + if(!node) + return 0; + + for(; i < 2; ++i) { + rc = ds_rpc_print_set(node->next[i], rpc, ctx, rpc_handle); + if(rc != 0) + return rc; + } + if(rpc->struct_add(rpc_handle, "{", "SET", &sh) < 0) { rpc->fault(ctx, 500, "Internal error set structure"); return -1;

1 0

git:master:648dd937: core: rpc dns.view returns an array of records
by Daniel-Constantin Mierla 05 May '18

05 May '18

Module: kamailio Branch: master Commit: 648dd937831654d40a9d615319693b87db31ef94 URL: https://github.com/kamailio/kamailio/commit/648dd937831654d40a9d615319693b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-04T14:18:11+02:00 core: rpc dns.view returns an array of records --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/648dd937831654d40a9d615319693b8… Patch: https://github.com/kamailio/kamailio/commit/648dd937831654d40a9d615319693b8… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 16b36e5a2b..4dc5554671 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -1044,7 +1044,7 @@ static rpc_export_t core_rpc_methods[] = { {"dns.debug_all", dns_cache_debug_all, dns_cache_debug_all_doc, 0 }, {"dns.view", dns_cache_view, dns_cache_view_doc, - 0 }, + RET_ARRAY }, {"dns.lookup", dns_cache_rpc_lookup, dns_cache_rpc_lookup_doc, 0 }, {"dns.delete_all", dns_cache_delete_all, dns_cache_delete_all_doc,

1 0

git:master:49bb4da2: Merge pull request #1522 from surendratiwari3/htable_event_callback_mode
by GitHub 04 May '18

04 May '18

Module: kamailio Branch: master Commit: 49bb4da2845abb9a2f271d97cce1a40bb77f0969 URL: https://github.com/kamailio/kamailio/commit/49bb4da2845abb9a2f271d97cce1a40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-05-04T07:09:48+02:00 Merge pull request #1522 from surendratiwari3/htable_event_callback_mode Module: htable:: event_callback_mode to int --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/49bb4da2845abb9a2f271d97cce1a40… Patch: https://github.com/kamailio/kamailio/commit/49bb4da2845abb9a2f271d97cce1a40… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 58b847edbf..3d7cc3e93f 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -146,7 +146,7 @@ static param_export_t params[]={ {"enable_dmq", INT_PARAM, &ht_enable_dmq}, {"timer_procs", PARAM_INT, &ht_timer_procs}, {"event_callback", PARAM_STR, &ht_event_callback}, - {"event_callback_mode", PARAM_STR, &ht_event_callback_mode}, + {"event_callback_mode", PARAM_INT, &ht_event_callback_mode}, {0,0,0} };

1 0

git:master:896c5e1c: Module: htable:: event_callback_mode to int
by surendratiwari3 04 May '18

04 May '18

Module: kamailio Branch: master Commit: 896c5e1c76e6836bedaf66f9b832020a0d70c04b URL: https://github.com/kamailio/kamailio/commit/896c5e1c76e6836bedaf66f9b832020… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Committer: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-05-04T09:33:36+05:30 Module: htable:: event_callback_mode to int --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/896c5e1c76e6836bedaf66f9b832020… Patch: https://github.com/kamailio/kamailio/commit/896c5e1c76e6836bedaf66f9b832020… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 58b847edbf..3d7cc3e93f 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -146,7 +146,7 @@ static param_export_t params[]={ {"enable_dmq", INT_PARAM, &ht_enable_dmq}, {"timer_procs", PARAM_INT, &ht_timer_procs}, {"event_callback", PARAM_STR, &ht_event_callback}, - {"event_callback_mode", PARAM_STR, &ht_event_callback_mode}, + {"event_callback_mode", PARAM_INT, &ht_event_callback_mode}, {0,0,0} };

1 0

[kamailio/kamailio] Module: htable:: event_callback_mode to int (#1522)
by Surendra Tiwari 04 May '18

04 May '18

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

2 1

[kamailio/kamailio] I_perform_user_authorization_request(): no int value param passed (#1099)
by riccardovarotto 04 May '18

04 May '18

### Description Using I-CSCF Kamailio module with 5.0.1 version we got the error: "I_perform_user_authorization_request(): no int value param passed" Same configuration file works well on 5.0.0 version  ### Troubleshooting #### Reproduction  #### Debugging Data 1(26715) ERROR: *** cfgtrace:request_route=[register] c=[/etc/KAMAILIO_ASTERISK_CFG/IMS_5/icscf/./kamailio.cfg] l=374 a=26 n=I_perform_user_authorization_request 1(26715) ERROR: <core> [core/sr_module.c:1766]: get_int_fparam(): Unexpected param type: 1280329042 1(26715) ERROR: ims_icscf [registration.c:78]: I_perform_user_authorization_request(): no int value param passed 1(26715) ERROR: *** cfgtrace:request_route=[register] c=[/etc/KAMAILIO_ASTERISK_CFG/IMS_5/icscf/./kamailio.cfg] l=375 a=26 n=send_reply [log_ko.gz](https://github.com/kamailio/kamailio/files/961675/log_ko.gz) [kamailio.cfg.txt](https://github.com/kamailio/kamailio/files/961677/kamaili…  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1099

5 11

[kamailio/kamailio] Module: Htable:: event_callback_mode to int (#1521)
by Surendra Tiwari 04 May '18

04 May '18

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

1 1

git:master:4bfcbc1f: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 03 May '18

03 May '18

Module: kamailio Branch: master Commit: 4bfcbc1fd8bb412382a2271ae465dc799cf6f50f URL: https://github.com/kamailio/kamailio/commit/4bfcbc1fd8bb412382a2271ae465dc7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-03T21:31:27+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/4bfcbc1fd8bb412382a2271ae465dc7… Patch: https://github.com/kamailio/kamailio/commit/4bfcbc1fd8bb412382a2271ae465dc7…

1 0

git:master:e72a4190: htable: docs for event_callback_mode parameter
by Daniel-Constantin Mierla 03 May '18

03 May '18

Module: kamailio Branch: master Commit: e72a41906da417cedb81ef8216c3c084fbb4902d URL: https://github.com/kamailio/kamailio/commit/e72a41906da417cedb81ef8216c3c08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-03T21:19:59+02:00 htable: docs for event_callback_mode parameter --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e72a41906da417cedb81ef8216c3c08… Patch: https://github.com/kamailio/kamailio/commit/e72a41906da417cedb81ef8216c3c08… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index d10a5ff2c8..00f7a6eb41 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -701,6 +701,30 @@ function ksr_htable_event(evname) return 1; end ... +</programlisting> + </example> + </section> + <section id="htable.p.event_callback_mode"> + <title><varname>event_callback_mode</varname> (int)</title> + <para> + Control when event_route[htable:init] is executed: 0 - after all + modules were initialized; 1 - in first worker process. + </para> + <para> + Set it to 1 if used in a KEMI script or when needing to use database + (e.g., via sqlops) inside event_route[htable:init]. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>event_callback_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("htable", "event_callback_mode", 1) +... </programlisting> </example> </section>

1 0

git:master:1b8ab845: htable: added parameter event_callback_mode
by Daniel-Constantin Mierla 03 May '18

03 May '18

Module: kamailio Branch: master Commit: 1b8ab8458806106a51de26afd06be5e3a15188b0 URL: https://github.com/kamailio/kamailio/commit/1b8ab8458806106a51de26afd06be5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-03T21:10:12+02:00 htable: added parameter event_callback_mode - control when event_route[htable:init] is executed: 0 - after all modules were initialized; 1 - in first worker process; (default 0) - fixes use with kemi framework by using value 1, because after module initialization the kemi framework is not ready, being set up per child process - reported by GH #1519 --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/1b8ab8458806106a51de26afd06be5e… Patch: https://github.com/kamailio/kamailio/commit/1b8ab8458806106a51de26afd06be5e… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index d14f914896..58b847edbf 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -53,6 +53,7 @@ int ht_timer_interval = 20; int ht_db_expires_flag = 0; int ht_enable_dmq = 0; int ht_timer_procs = 0; +static int ht_event_callback_mode = 0; str ht_event_callback = STR_NULL; @@ -131,20 +132,21 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - {"htable", PARAM_STRING|USE_FUNC_PARAM, (void*)ht_param}, - {"db_url", PARAM_STR, &ht_db_url}, - {"key_name_column", PARAM_STR, &ht_db_name_column}, - {"key_type_column", PARAM_STR, &ht_db_ktype_column}, - {"value_type_column", PARAM_STR, &ht_db_vtype_column}, - {"key_value_column", PARAM_STR, &ht_db_value_column}, - {"expires_column", PARAM_STR, &ht_db_expires_column}, - {"array_size_suffix", PARAM_STR, &ht_array_size_suffix}, - {"fetch_rows", INT_PARAM, &ht_fetch_rows}, - {"timer_interval", INT_PARAM, &ht_timer_interval}, - {"db_expires", INT_PARAM, &ht_db_expires_flag}, - {"enable_dmq", INT_PARAM, &ht_enable_dmq}, - {"timer_procs", PARAM_INT, &ht_timer_procs}, - {"event_callback", PARAM_STR, &ht_event_callback}, + {"htable", PARAM_STRING|USE_FUNC_PARAM, (void*)ht_param}, + {"db_url", PARAM_STR, &ht_db_url}, + {"key_name_column", PARAM_STR, &ht_db_name_column}, + {"key_type_column", PARAM_STR, &ht_db_ktype_column}, + {"value_type_column", PARAM_STR, &ht_db_vtype_column}, + {"key_value_column", PARAM_STR, &ht_db_value_column}, + {"expires_column", PARAM_STR, &ht_db_expires_column}, + {"array_size_suffix", PARAM_STR, &ht_array_size_suffix}, + {"fetch_rows", INT_PARAM, &ht_fetch_rows}, + {"timer_interval", INT_PARAM, &ht_timer_interval}, + {"db_expires", INT_PARAM, &ht_db_expires_flag}, + {"enable_dmq", INT_PARAM, &ht_enable_dmq}, + {"timer_procs", PARAM_INT, &ht_timer_procs}, + {"event_callback", PARAM_STR, &ht_event_callback}, + {"event_callback_mode", PARAM_STR, &ht_event_callback_mode}, {0,0,0} }; @@ -219,7 +221,9 @@ static int mod_init(void) return 0; } - +/** + * + */ static int child_init(int rank) { struct sip_msg *fmsg; @@ -243,9 +247,11 @@ static int child_init(int rank) } } - if (rank!=PROC_INIT) + if (ht_event_callback_mode==0 && rank!=PROC_INIT) return 0; + if (ht_event_callback_mode==1 && rank!=PROC_SIPINIT) + return 0; rt = -1; if(ht_event_callback.s==NULL || ht_event_callback.len<=0) {

1 0

git:master:6285b5eb: core: dns - print index and remove per record type printing added previously
by Daniel-Constantin Mierla 03 May '18

03 May '18

Module: kamailio Branch: master Commit: 6285b5ebe02d39bf77baa8f29d16de246dc1ad77 URL: https://github.com/kamailio/kamailio/commit/6285b5ebe02d39bf77baa8f29d16de2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-03T20:47:37+02:00 core: dns - print index and remove per record type printing added previously - type is already printed at the top of the structure --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/6285b5ebe02d39bf77baa8f29d16de2… Patch: https://github.com/kamailio/kamailio/commit/6285b5ebe02d39bf77baa8f29d16de2… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 0c53ebd50d..bff6ecfb97 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3804,6 +3804,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) ticks_t now; str s; int i; + int n; now=get_ticks_raw(); expires = (s_ticks_t)(e->expire-now)<0?-1: TICKS_TO_S(e->expire-now); @@ -3824,16 +3825,12 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) TICKS_TO_S(now-e->last_used)); rpc->rpl_printf(ctx, "%snegative entry: %s", SPACE_FORMAT, (e->ent_flags & DNS_FLAG_BAD_NAME) ? "yes" : "no"); - + n = 0; for (rr=e->rr_lst; rr; rr=rr->next) { + rpc->rpl_printf(ctx, "%srr idx: %d", SPACE_FORMAT, n++); switch(e->type) { case T_A: case T_AAAA: - if(e->type==T_A) { - rpc->rpl_printf(ctx, "%srr type: a", SPACE_FORMAT); - } else { - rpc->rpl_printf(ctx, "%srr type: aaaa", SPACE_FORMAT); - } if (dns_rr2ip(e->type, rr, &ip)==0){ rpc->rpl_printf(ctx, "%srr ip: %s", SPACE_FORMAT, ip_addr2a(&ip) ); @@ -3843,7 +3840,6 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_SRV: - rpc->rpl_printf(ctx, "%srr type: srv", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct srv_rdata*)(rr->rdata))->name); rpc->rpl_printf(ctx, "%srr port: %d", SPACE_FORMAT, @@ -3854,7 +3850,6 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) ((struct srv_rdata*)(rr->rdata))->weight); break; case T_NAPTR: - rpc->rpl_printf(ctx, "%srr type: naptr", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr order: %d", SPACE_FORMAT, ((struct naptr_rdata*)(rr->rdata))->order); rpc->rpl_printf(ctx, "%srr preference: %d", SPACE_FORMAT, @@ -3877,12 +3872,10 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) SPACE_FORMAT, s.len, s.s); break; case T_CNAME: - rpc->rpl_printf(ctx, "%srr type: cname", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct cname_rdata*)(rr->rdata))->name); break; case T_TXT: - rpc->rpl_printf(ctx, "%srr type: txt", SPACE_FORMAT); for (i=0; i<((struct txt_rdata*)(rr->rdata))->cstr_no; i++){ rpc->rpl_printf(ctx, "%stxt[%d]: %s", SPACE_FORMAT, i, @@ -3890,7 +3883,6 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_EBL: - rpc->rpl_printf(ctx, "%srr type: ebl", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr position: %d", SPACE_FORMAT, ((struct ebl_rdata*)(rr->rdata))->position); rpc->rpl_printf(ctx, "%srr separator: %s", SPACE_FORMAT, @@ -3899,7 +3891,6 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) ((struct ebl_rdata*)(rr->rdata))->apex); break; case T_PTR: - rpc->rpl_printf(ctx, "%srr type: ptr", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct ptr_rdata*)(rr->rdata))->ptrdname); break;

1 0

git:master:b72e0b69: core: print rr type for rpc dns.view
by Daniel-Constantin Mierla 03 May '18

03 May '18

Module: kamailio Branch: master Commit: b72e0b6984e87b42f0a578a6b220a28a80e67737 URL: https://github.com/kamailio/kamailio/commit/b72e0b6984e87b42f0a578a6b220a28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-03T14:39:10+02:00 core: print rr type for rpc dns.view --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/b72e0b6984e87b42f0a578a6b220a28… Patch: https://github.com/kamailio/kamailio/commit/b72e0b6984e87b42f0a578a6b220a28… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index b8d8c5e438..0c53ebd50d 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3829,6 +3829,11 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) switch(e->type) { case T_A: case T_AAAA: + if(e->type==T_A) { + rpc->rpl_printf(ctx, "%srr type: a", SPACE_FORMAT); + } else { + rpc->rpl_printf(ctx, "%srr type: aaaa", SPACE_FORMAT); + } if (dns_rr2ip(e->type, rr, &ip)==0){ rpc->rpl_printf(ctx, "%srr ip: %s", SPACE_FORMAT, ip_addr2a(&ip) ); @@ -3838,6 +3843,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_SRV: + rpc->rpl_printf(ctx, "%srr type: srv", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct srv_rdata*)(rr->rdata))->name); rpc->rpl_printf(ctx, "%srr port: %d", SPACE_FORMAT, @@ -3848,6 +3854,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) ((struct srv_rdata*)(rr->rdata))->weight); break; case T_NAPTR: + rpc->rpl_printf(ctx, "%srr type: naptr", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr order: %d", SPACE_FORMAT, ((struct naptr_rdata*)(rr->rdata))->order); rpc->rpl_printf(ctx, "%srr preference: %d", SPACE_FORMAT, @@ -3870,10 +3877,12 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) SPACE_FORMAT, s.len, s.s); break; case T_CNAME: + rpc->rpl_printf(ctx, "%srr type: cname", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct cname_rdata*)(rr->rdata))->name); break; case T_TXT: + rpc->rpl_printf(ctx, "%srr type: txt", SPACE_FORMAT); for (i=0; i<((struct txt_rdata*)(rr->rdata))->cstr_no; i++){ rpc->rpl_printf(ctx, "%stxt[%d]: %s", SPACE_FORMAT, i, @@ -3881,6 +3890,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) } break; case T_EBL: + rpc->rpl_printf(ctx, "%srr type: ebl", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr position: %d", SPACE_FORMAT, ((struct ebl_rdata*)(rr->rdata))->position); rpc->rpl_printf(ctx, "%srr separator: %s", SPACE_FORMAT, @@ -3889,6 +3899,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) ((struct ebl_rdata*)(rr->rdata))->apex); break; case T_PTR: + rpc->rpl_printf(ctx, "%srr type: ptr", SPACE_FORMAT); rpc->rpl_printf(ctx, "%srr name: %s", SPACE_FORMAT, ((struct ptr_rdata*)(rr->rdata))->ptrdname); break;

1 0

git:master:b4ad3105: kamailio.cfg: small sample for number normalization on pstw gw routing
by Daniel-Constantin Mierla 03 May '18

03 May '18

Module: kamailio Branch: master Commit: b4ad3105e11559bfe502523f60b085ea720a06a5 URL: https://github.com/kamailio/kamailio/commit/b4ad3105e11559bfe502523f60b085e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-03T09:50:57+02:00 kamailio.cfg: small sample for number normalization on pstw gw routing --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b4ad3105e11559bfe502523f60b085e… Patch: https://github.com/kamailio/kamailio/commit/b4ad3105e11559bfe502523f60b085e… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index b55e06b0cc..13bef88de1 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -854,6 +854,13 @@ route[PSTN] { exit; } + # normalize target number for pstn gateway + # - convert leading 00 to + + if (starts_with("$rU", "00")) { + strip(2); + prefix("+"); + } + if (strempty($sel(cfg_get.pstn.gw_port))) { $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip); } else {

1 0

git:master:7c61624a: modules: readme files regenerated - sipcapture ... [skip ci]
by Kamailio Dev 02 May '18

02 May '18

Module: kamailio Branch: master Commit: 7c61624a7d8827387663b68b4bdcdf82a9c2ad51 URL: https://github.com/kamailio/kamailio/commit/7c61624a7d8827387663b68b4bdcdf8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-02T12:31:45+02:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/7c61624a7d8827387663b68b4bdcdf8… Patch: https://github.com/kamailio/kamailio/commit/7c61624a7d8827387663b68b4bdcdf8… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index 15ca18b75c..cd82e0f6e4 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -57,6 +57,7 @@ Alexandr Dubovikov 4.1. sip_capture([table], [cmode]) 4.2. report_capture([table], [cid], [data]) 4.3. float2int(fval, ival) + 4.4. sip_capture_forward(uri) 5. Event Routes @@ -96,7 +97,8 @@ Alexandr Dubovikov 1.23. sip_capture() usage 1.24. report_capture() usage 1.25. report_capture() usage - 1.26. event_route[sipcapture:request] usage + 1.26. sip_capture_forward() usage + 1.27. event_route[sipcapture:request] usage Chapter 1. Admin Guide @@ -138,6 +140,7 @@ Chapter 1. Admin Guide 4.1. sip_capture([table], [cmode]) 4.2. report_capture([table], [cid], [data]) 4.3. float2int(fval, ival) + 4.4. sip_capture_forward(uri) 5. Event Routes @@ -515,6 +518,7 @@ end 4.1. sip_capture([table], [cmode]) 4.2. report_capture([table], [cid], [data]) 4.3. float2int(fval, ival) + 4.4. sip_capture_forward(uri) 4.1. sip_capture([table], [cmode]) @@ -574,6 +578,28 @@ report_capture("report_data", "$ci", "{\"MOS\":4.1,\"PACKET_LOST\":100"}); $var(res) = float2int("10.5", "1"); ... +4.4. sip_capture_forward(uri) + + Forward the HEP packet to an address specified by the parameter uri (it + has to be a sip uri format). The function should be used inside + event_route[sipcapture:request]. After using this function, add a + return 0 in order to stop processing further the packet in the local + Kamailio instance. + + This function can be used from ANY_ROUTE. + + Example 1.26. sip_capture_forward() usage +... + event_route[sipcapture:request] { + ... + if(src_ip==1.2.3.4) { + sip_capture_forward("sip:2.3.4.5:5090"); + return 0; + } + ... + } +... + 5. Event Routes 5.1. event_route[sipcapture:request] @@ -583,7 +609,7 @@ $var(res) = float2int("10.5", "1"); Event route block to be executed when HEP packet is received. It requires module parameter 'nonsip_hook' to be set to 1. - Example 1.26. event_route[sipcapture:request] usage + Example 1.27. event_route[sipcapture:request] usage ... # new event sipcapture socket modparam("sipcapture", "nonsip_hook", 1)

1 0

git:master:d867d8ab: sipcapture: docs for sip_capture_forward(uri)
by Daniel-Constantin Mierla 02 May '18

02 May '18

Module: kamailio Branch: master Commit: d867d8abfd503a2e7d979d4979d2b0a209d5c430 URL: https://github.com/kamailio/kamailio/commit/d867d8abfd503a2e7d979d4979d2b0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-02T12:18:57+02:00 sipcapture: docs for sip_capture_forward(uri) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d867d8abfd503a2e7d979d4979d2b0a… Patch: https://github.com/kamailio/kamailio/commit/d867d8abfd503a2e7d979d4979d2b0a… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 5f7055a4b6..0dbfafae96 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -648,6 +648,36 @@ report_capture("report_data", "$ci", "{\"MOS\":4.1,\"PACKET_LOST\":100"}); ... $var(res) = float2int("10.5", "1"); ... +</programlisting> + </example> + </section> + <section id="sipcapture.f.sip_capture_forward"> + <title> + <function moreinfo="none">sip_capture_forward(uri)</function> + </title> + <para> + Forward the HEP packet to an address specified by the parameter uri + (it has to be a sip uri format). The function should be used inside + event_route[sipcapture:request]. After using this function, add a + return 0 in order to stop processing further the packet in the local + &kamailio; instance. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sip_capture_forward()</function> usage</title> + <programlisting format="linespecific"> +... + event_route[sipcapture:request] { + ... + if(src_ip==1.2.3.4) { + sip_capture_forward("sip:2.3.4.5:5090"); + return 0; + } + ... + } +... </programlisting> </example> </section>

1 0

git:master:9853d9b4: sipcapture: added sip_capture_forward(uri)
by Daniel-Constantin Mierla 02 May '18

02 May '18

Module: kamailio Branch: master Commit: 9853d9b4d3e7ee863170aa22acccfe8de810b435 URL: https://github.com/kamailio/kamailio/commit/9853d9b4d3e7ee863170aa22acccfe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-02T12:10:45+02:00 sipcapture: added sip_capture_forward(uri) - forward the hep packet to another address - the address has to bbe provided as parameter in sip uri format - the function should be used inside event_route[sipcapture:request] event_route[sipcapture:request] { if(src_ip==1.2.3.4) { sip_capture_forward("sip:2.3.4.5:5090"); return 0; } } --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/9853d9b4d3e7ee863170aa22acccfe8… Patch: https://github.com/kamailio/kamailio/commit/9853d9b4d3e7ee863170aa22acccfe8… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 53735000f1..6f0108a055 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -67,6 +67,7 @@ #include "../../core/parser/parse_uri.h" #include "../../core/parser/digest/digest.h" #include "../../core/parser/parse_ppi_pai.h" +#include "../../core/forward.h" #include "../../core/pvar.h" #include "../../core/str.h" #include "../../core/onsend.h" @@ -158,6 +159,8 @@ static int w_report_capture3(sip_msg_t *_m, char *_table, char *_corr, char *_data); static int w_float2int(sip_msg_t *_m, char *_val, char *_coof); +static int w_sip_capture_forward(sip_msg_t *_m, char *_dst, char *_p2); + static int sipcapture_parse_aleg_callid_headers(); int parse_aleg_callid_headers(str *headers_str, str *headers); @@ -310,6 +313,8 @@ static cmd_export_t cmds[] = { reportcapture_fixup, 0, ANY_ROUTE}, {"float2int", (cmd_function)w_float2int, 2, float2int_fixup, 0, ANY_ROUTE}, + {"sip_capture_forward", (cmd_function)w_sip_capture_forward, 1, + fixup_spve_null, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0}}; @@ -2895,11 +2900,10 @@ static int nosip_hep_msg(sr_event_param_t *evp) int rtb; sr_kemi_eng_t *keng = NULL; str evname = str_init("sipcapture:request"); + struct hep_hdr *heph; msg = (sip_msg_t *)evp->data; - struct hep_hdr *heph; - buf = msg->buf; len = msg->len; @@ -3097,6 +3101,98 @@ static int pv_get_hep(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return 0; } +/** + * + */ +static int ki_sip_capture_forward(sip_msg_t *msg, str *puri) +{ + dest_info_t dst; + sip_uri_t next_hop; + str pdata; + int ret = 0; + char proto; + + if(parse_uri(puri->s, puri->len, &next_hop)<0) { + LM_ERR("bad dst sip uri <%.*s>\n", puri->len, puri->s); + return -1; + } + + init_dest_info(&dst); + LM_DBG("sending data to sip uri <%.*s>\n", puri->len, puri->s); + proto = next_hop.proto; + if(sip_hostport2su(&dst.to, &next_hop.host, next_hop.port_no, + &proto)!=0) { + LM_ERR("failed to resolve [%.*s]\n", next_hop.host.len, + ZSW(next_hop.host.s)); + return -1; + } + dst.proto = proto; + if(dst.proto==PROTO_NONE) dst.proto = PROTO_UDP; + + pdata.s = msg->buf; + pdata.len = msg->len; + + if (dst.proto == PROTO_UDP) { + dst.send_sock=get_send_socket(0, &dst.to, PROTO_UDP); + if (dst.send_sock!=0) { + ret=udp_send(&dst, pdata.s, pdata.len); + } else { + LM_ERR("no socket for dst sip uri <%.*s>\n", puri->len, puri->s); + ret=-1; + } + } +#ifdef USE_TCP + else if(dst.proto == PROTO_TCP) { + /*tcp*/ + dst.id=0; + ret=tcp_send(&dst, 0, pdata.s, pdata.len); + } +#endif +#ifdef USE_TLS + else if(dst.proto == PROTO_TLS) { + /*tls*/ + dst.id=0; + ret=tcp_send(&dst, 0, pdata.s, pdata.len); + } +#endif +#ifdef USE_SCTP + else if(dst.proto == PROTO_SCTP) { + /*sctp*/ + dst.send_sock=get_send_socket(0, &dst.to, PROTO_SCTP); + if (dst.send_sock!=0) { + ret=sctp_core_msg_send(&dst, pdata.s, pdata.len); + } else { + LM_ERR("no socket for dst sip uri <%.*s>\n", puri->len, puri->s); + ret=-1; + } + } +#endif + else { + LM_ERR("unknown proto [%d] for dst sip uri <%.*s>\n", + dst.proto, puri->len, puri->s); + ret=-1; + } + + if (ret>=0) ret=1; + + return ret; +} + +/** + * + */ +static int w_sip_capture_forward(sip_msg_t *_m, char *_dst, char *_p2) +{ + str sdst; + + if(fixup_get_svalue(_m, (gparam_t*)_dst, &sdst)<0) { + LM_ERR("failed to get the destination address\n"); + return -1; + } + + return ki_sip_capture_forward(_m, &sdst); +} + /** * */ @@ -3137,6 +3233,11 @@ static sr_kemi_t sr_kemi_sipcapture_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sipcapture"), str_init("sip_capture_forward"), + SR_KEMIP_INT, ki_sip_capture_forward, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] usrloc: Incorrect date format used to query contacts by expire time. (#1514)
by Konstantin 02 May '18

02 May '18

#### 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 - In the function get_all_db_ucontacts() date was passed to db module as a regular string, but in some cases that leads to incorrect db query, e.g. in case of mongodb. DATATIME format should be used instead of string. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1514 -- Commit Summary -- * Incorrect date format used to query contacts by expire time. -- File Changes -- M src/modules/usrloc/dlist.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1514.patch https://github.com/kamailio/kamailio/pull/1514.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/1514

2 4

git:master:943724e6: usrloc: removed useless set of db type for expire column
by Daniel-Constantin Mierla 02 May '18

02 May '18

Module: kamailio Branch: master Commit: 943724e62c2b3bb98a37d9f496cc6c76ecb976cb URL: https://github.com/kamailio/kamailio/commit/943724e62c2b3bb98a37d9f496cc6c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-02T08:19:10+02:00 usrloc: removed useless set of db type for expire column --- Modified: src/modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/943724e62c2b3bb98a37d9f496cc6c7… Patch: https://github.com/kamailio/kamailio/commit/943724e62c2b3bb98a37d9f496cc6c7… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index c2b3e15791..77eecc5aed 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -132,7 +132,6 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, /* where fields */ keys1[0] = &expires_col; ops1[0] = OP_GT; - vals1[0].type = DB1_STR; vals1[0].nul = 0; UL_DB_EXPIRES_SET(&vals1[0], time(0));

1 0

git:master:944dc1dc: usrloc: use UL_DB_EXPIRES_SET() inside get_all_db_ucontacts()
by Daniel-Constantin Mierla 02 May '18

02 May '18

Module: kamailio Branch: master Commit: 944dc1dc1e6261a3c179ff11bf3531e379eb9f35 URL: https://github.com/kamailio/kamailio/commit/944dc1dc1e6261a3c179ff11bf3531e… Author: Konstantin Poliakov <k.polyakov(a)mightycall.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-02T08:19:10+02:00 usrloc: use UL_DB_EXPIRES_SET() inside get_all_db_ucontacts() - fix matching date field for some backends, such as mongodb, as well as obey ul_expires_type value --- Modified: src/modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/944dc1dc1e6261a3c179ff11bf3531e… Patch: https://github.com/kamailio/kamailio/commit/944dc1dc1e6261a3c179ff11bf3531e… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index f649130a98..c2b3e15791 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -97,8 +97,6 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, db1_res_t* res = NULL; db_row_t *row; dlist_t *dom; - str now; - char now_s[25]; int port, proto; char *p; str addr; @@ -121,13 +119,6 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, /* Reserve space for terminating 0000 */ len -= sizeof(addr.len); - /* get the current time in DB format */ - now.len = 25; - now.s = now_s; - if (db_time2str_ex( time(0), now.s, &now.len, 0)!=0) { - LM_ERR("failed to print now time\n"); - return -1; - } aorhash = 0; /* select fields */ @@ -143,7 +134,7 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags, ops1[0] = OP_GT; vals1[0].type = DB1_STR; vals1[0].nul = 0; - vals1[0].val.str_val = now; + UL_DB_EXPIRES_SET(&vals1[0], time(0)); keys1[1] = &partition_col; ops1[1] = OP_EQ;

1 0

git:master:cb80d6b9: Merge pull request #1516 from tiglat/tiglat/nathelper_doesnt_ping_all_contacts
by GitHub 02 May '18

02 May '18

Module: kamailio Branch: master Commit: cb80d6b93325787c336100c3710cda8f6d88c404 URL: https://github.com/kamailio/kamailio/commit/cb80d6b93325787c336100c3710cda8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-05-02T08:13:06+02:00 Merge pull request #1516 from tiglat/tiglat/nathelper_doesnt_ping_all_contacts nathelper: it doesn't ping contacts if ping_nated_only=0 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/cb80d6b93325787c336100c3710cda8… Patch: https://github.com/kamailio/kamailio/commit/cb80d6b93325787c336100c3710cda8… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 935c981ee8..5382d4c6b8 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1921,6 +1921,7 @@ static void nh_timer(unsigned int ticks, void *timer_idx) unsigned int path_ip = 0; unsigned short path_port = 0; int options = 0; + int should_send_ping = 0; if((*natping_state) == 0) goto done; @@ -2059,10 +2060,9 @@ static void nh_timer(unsigned int ticks, void *timer_idx) dst.proto = PROTO_UDP; dst.send_sock = send_sock; - if((flags & sipping_flag) != 0 - && (opt.s = build_sipping( - &c, send_sock, &path, &ruid, aorhash, &opt.len)) - != 0) { + should_send_ping = (flags & sipping_flag) != 0 || ping_nated_only == 0; + + if ( should_send_ping && (opt.s = build_sipping(&c, send_sock, &path, &ruid, aorhash, &opt.len)) != 0) { if(udp_send(&dst, opt.s, opt.len) < 0) { LM_ERR("sip udp_send failed\n"); }

1 0

git:master:2fb84e5e: nathelper: moved var declaration into the begining of function.
by Konstantin Poliakov 02 May '18

02 May '18

Module: kamailio Branch: master Commit: 2fb84e5e101b61bbaedc18d8b37188cbc6b1cee8 URL: https://github.com/kamailio/kamailio/commit/2fb84e5e101b61bbaedc18d8b37188c… Author: Konstantin Poliakov <k.polyakov(a)mightycall.com> Committer: Konstantin Poliakov <k.polyakov(a)mightycall.com> Date: 2018-04-30T23:57:19+03:00 nathelper: moved var declaration into the begining of function. --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/2fb84e5e101b61bbaedc18d8b37188c… Patch: https://github.com/kamailio/kamailio/commit/2fb84e5e101b61bbaedc18d8b37188c… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 953384265a..5382d4c6b8 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1921,6 +1921,7 @@ static void nh_timer(unsigned int ticks, void *timer_idx) unsigned int path_ip = 0; unsigned short path_port = 0; int options = 0; + int should_send_ping = 0; if((*natping_state) == 0) goto done; @@ -2059,7 +2060,7 @@ static void nh_timer(unsigned int ticks, void *timer_idx) dst.proto = PROTO_UDP; dst.send_sock = send_sock; - int should_send_ping = (flags & sipping_flag) != 0 || ping_nated_only == 0; + should_send_ping = (flags & sipping_flag) != 0 || ping_nated_only == 0; if ( should_send_ping && (opt.s = build_sipping(&c, send_sock, &path, &ruid, aorhash, &opt.len)) != 0) { if(udp_send(&dst, opt.s, opt.len) < 0) {

1 0

git:master:b34cf58a: nathelper: it doesn't ping contacts if ping_nated_only=0
by Konstantin Poliakov 02 May '18

02 May '18

Module: kamailio Branch: master Commit: b34cf58a3a88e5ed2b2aa6aa9e5df0e5bb1808f9 URL: https://github.com/kamailio/kamailio/commit/b34cf58a3a88e5ed2b2aa6aa9e5df0e… Author: Konstantin Poliakov <k.polyakov(a)mightycall.com> Committer: Konstantin Poliakov <k.polyakov(a)mightycall.com> Date: 2018-04-29T21:07:19+03:00 nathelper: it doesn't ping contacts if ping_nated_only=0 - nathelper sends ping only if nat flag is specified, but if ping_nated_only=0 it should ping all contact in any case. --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/b34cf58a3a88e5ed2b2aa6aa9e5df0e… Patch: https://github.com/kamailio/kamailio/commit/b34cf58a3a88e5ed2b2aa6aa9e5df0e… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 935c981ee8..953384265a 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2059,10 +2059,9 @@ static void nh_timer(unsigned int ticks, void *timer_idx) dst.proto = PROTO_UDP; dst.send_sock = send_sock; - if((flags & sipping_flag) != 0 - && (opt.s = build_sipping( - &c, send_sock, &path, &ruid, aorhash, &opt.len)) - != 0) { + int should_send_ping = (flags & sipping_flag) != 0 || ping_nated_only == 0; + + if ( should_send_ping && (opt.s = build_sipping(&c, send_sock, &path, &ruid, aorhash, &opt.len)) != 0) { if(udp_send(&dst, opt.s, opt.len) < 0) { LM_ERR("sip udp_send failed\n"); }

1 0

[kamailio/kamailio] nathelper: it doesn't ping contacts if ping_nated_only=0 (#1516)
by Konstantin 02 May '18

02 May '18

- nathelper sends ping only if nat flag is specified, but if ping_nated_only=0 it should ping all contact in any case. #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description We need to check presence of nat flag with check of ping_nated_only parameter to avoid situation when flag is not specified by user wants to ping all contacts and don't get any pings. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1516 -- Commit Summary -- * nathelper: it doesn't ping contacts if ping_nated_only=0 -- File Changes -- M src/modules/nathelper/nathelper.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1516.patch https://github.com/kamailio/kamailio/pull/1516.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/1516

2 5

[kamailio/kamailio] Supressing SIP registartion with 200OK (#1518)
by BipinRadisys 02 May '18

02 May '18

Hi, Is there any way in Kamailio where I can suppress sip registration authentication. I want, Kamailio can send 200 OK for sip registration without going for 401 Unauthorized. Please tell me if you have such configuration in Kamailio. thanks Bipin -- 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/1518

2 2

[kamailio/kamailio] Can't load tm.so when built from master (#1517)
by kmduk 01 May '18

01 May '18

ERROR: <core> [core/sr_module.c:582]: load_module(): could not open module </usr/local/lib64/kamailio/modules/tm.so>: /usr/local/lib64/kamailio/modules/tm.so: undefined symbol: w_t_reply_wrp Looks like the function was removed in commit a6c3b35dde900c718d8d010b0b8094b384b890d8 -- 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/1517

2 2

git:master:42a55edc: tm: readded w_t_reply_wrp()
by Daniel-Constantin Mierla 01 May '18

01 May '18

Module: kamailio Branch: master Commit: 42a55edcfbdac1653ee5f85ff388a733f6c385f4 URL: https://github.com/kamailio/kamailio/commit/42a55edcfbdac1653ee5f85ff388a73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-01T20:52:23+02:00 tm: readded w_t_reply_wrp() - needed for exports to inter-module api - simplified version after changes in tm reply code - reported by GH #1517 --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/42a55edcfbdac1653ee5f85ff388a73… Patch: https://github.com/kamailio/kamailio/commit/42a55edcfbdac1653ee5f85ff388a73… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index a7977d7003..f264a0b781 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1393,6 +1393,17 @@ static int w_t_reply(struct sip_msg* msg, char* p1, char* p2) return ki_t_reply(msg, code, &reason); } +/* wrapper for inter-module api */ +int w_t_reply_wrp(struct sip_msg *msg, unsigned int code, char *txt) +{ + str reason; + + reason.s = txt; + reason.len = strlen(reason.s); + + return ki_t_reply(msg, code, &reason); +} + /** * */

1 0

[kamailio] error while dumping dialog via RPC (#145)
by Savolainen Dmitri 01 May '18

01 May '18

In part of profiles and/or variables section while using `static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, int with_context) ` May be it is an error of ctl module ``` # kamcmd dlg.list { h_entry: 6718 h_id: 20440 call-id: 48c9fe85f6750163(a)192.168.5.60 from_uri: sip:000*051@xxxxxx.xx:5068 to_uri: sip:002@xxxxxx.xx:5068 state: 4 start_ts: 1430324850 init_ts: 1430324847 timeout: 1430368049 lifetime: 43200 dflags: 515 sflags: 0 iflags: 0 caller: { tag: bda5e24faa4c4ff5 contact: sip:000*051@192.168.5.60:5066;transport=udp;alias=xxx.xxx.78.202~5066~1 cseq: 5457 route_set: socket: udp:xxx.xxx.66.150:5068 } callee: { tag: 4y2gjr7N9231K contact: sip:002@xxx.xxx.66.151:5080;transport=udp cseq: 0 route_set: socket: udp:xxx.xxx.66.150:5068 } profiles: { ERROR while parsing the record 62, @698: 03 : bad record ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/145

4 6

git:master:20b0f29f: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: 20b0f29fa489b220d4460d079541d0f045458871 URL: https://github.com/kamailio/kamailio/commit/20b0f29fa489b220d4460d079541d0f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-30T18:01:35+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/20b0f29fa489b220d4460d079541d0f… Patch: https://github.com/kamailio/kamailio/commit/20b0f29fa489b220d4460d079541d0f… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 8260fe194a..f1b236e936 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -88,7 +88,7 @@ Daniel-Constantin Mierla 4.9. t_on_branch(branch_route) 4.10. t_newtran() 4.11. t_reply(code, reason_phrase) - 4.12. t_semd_reply(code, reason) + 4.12. t_send_reply(code, reason) 4.13. t_lookup_request() 4.14. t_retransmit_reply() 4.15. t_release() @@ -332,7 +332,7 @@ Chapter 1. Admin Guide 4.9. t_on_branch(branch_route) 4.10. t_newtran() 4.11. t_reply(code, reason_phrase) - 4.12. t_semd_reply(code, reason) + 4.12. t_send_reply(code, reason) 4.13. t_lookup_request() 4.14. t_retransmit_reply() 4.15. t_release() @@ -1639,7 +1639,7 @@ end 4.9. t_on_branch(branch_route) 4.10. t_newtran() 4.11. t_reply(code, reason_phrase) - 4.12. t_semd_reply(code, reason) + 4.12. t_send_reply(code, reason) 4.13. t_lookup_request() 4.14. t_retransmit_reply() 4.15. t_release() @@ -1913,7 +1913,7 @@ if (t_newtran()) { t_reply("404", "Not found"); ... -4.12. t_semd_reply(code, reason) +4.12. t_send_reply(code, reason) Creates the transaction if it does not exist (executing internally t_newtran()) and sends a stateful reply (executing internally

1 0

git:master:993dd0c8: tm: small spelling fix in docs (semd -> send)
by Henning Westerholt 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: 993dd0c808402ade144783d527b7db0e2227987d URL: https://github.com/kamailio/kamailio/commit/993dd0c808402ade144783d527b7db0… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-30T17:47:09+02:00 tm: small spelling fix in docs (semd -> send) --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/993dd0c808402ade144783d527b7db0… Patch: https://github.com/kamailio/kamailio/commit/993dd0c808402ade144783d527b7db0… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index f9a1995e52..67cc5d017c 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -362,7 +362,7 @@ t_reply("404", "Not found"); <section id="tm.f.t_send_reply"> <title> - <function>t_semd_reply(code, reason)</function> + <function>t_send_reply(code, reason)</function> </title> <para> Creates the transaction if it does not exist (executing internally

1 0

git:master:4c9bcb4c: usrloc: renamed global var matching_mode to ul_matching_mode
by Daniel-Constantin Mierla 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: 4c9bcb4cce43b3b8f25667d52d0aea98382e7db5 URL: https://github.com/kamailio/kamailio/commit/4c9bcb4cce43b3b8f25667d52d0aea9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-30T12:51:07+02:00 usrloc: renamed global var matching_mode to ul_matching_mode - avoid exports conflict with the other usrloc alternative modules --- Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/urecord.c Modified: src/modules/usrloc/usrloc_mod.c Modified: src/modules/usrloc/usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/4c9bcb4cce43b3b8f25667d52d0aea9… Patch: https://github.com/kamailio/kamailio/commit/4c9bcb4cce43b3b8f25667d52d0aea9… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index a43c5c6c00..93b30fab05 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -739,7 +739,7 @@ int db_update_ucontact_addr(ucontact_t* _c) LM_DBG("contact:%.*s\n", vals1[n1].val.str_val.len, vals1[n1].val.str_val.s); n1++; - switch (matching_mode) { + switch (ul_matching_mode) { case CONTACT_ONLY: /* update call-id */ keys2[nr_cols2] = &callid_col; @@ -796,7 +796,7 @@ int db_update_ucontact_addr(ucontact_t* _c) nr_cols2++; break; default: - LM_CRIT("unknown matching_mode %d\n", matching_mode); + LM_CRIT("unknown matching_mode %d\n", ul_matching_mode); return -1; } @@ -1464,7 +1464,7 @@ int db_delete_ucontact_addr(ucontact_t* _c) vals[n].val.str_val = _c->c; n++; - switch (matching_mode) { + switch (ul_matching_mode) { case CONTACT_ONLY: break; case CONTACT_CALLID: @@ -1486,7 +1486,7 @@ int db_delete_ucontact_addr(ucontact_t* _c) n++; break; default: - LM_CRIT("unknown matching_mode %d\n", matching_mode); + LM_CRIT("unknown matching_mode %d\n", ul_matching_mode); return -1; } diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index 598cbd88fe..279ab2d17c 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -42,7 +42,7 @@ #include "usrloc.h" /*! contact matching mode */ -int matching_mode = CONTACT_ONLY; +int ul_matching_mode = CONTACT_ONLY; /*! retransmission detection interval in seconds */ int cseq_delay = 20; @@ -772,7 +772,7 @@ int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, int _cseq, no_callid = 0; *_co = 0; - switch (matching_mode) { + switch (ul_matching_mode) { case CONTACT_ONLY: ptr = contact_match( _r->contacts, _c); break; @@ -787,7 +787,7 @@ int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, int _cseq, ptr = contact_match_callidonly( _r->contacts, _callid); break; default: - LM_CRIT("unknown matching_mode %d\n", matching_mode); + LM_CRIT("unknown matching_mode %d\n", ul_matching_mode); return -1; } diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 50eb0cb888..d0f8d22b6f 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -220,7 +220,7 @@ static param_export_t params[] = { {"connection_id_column",PARAM_STR, &con_id_col }, {"keepalive_column", PARAM_STR, &keepalive_col }, {"partition_column", PARAM_STR, &partition_col }, - {"matching_mode", INT_PARAM, &matching_mode }, + {"matching_mode", INT_PARAM, &ul_matching_mode }, {"cseq_delay", INT_PARAM, &cseq_delay }, {"fetch_rows", INT_PARAM, &ul_fetch_rows }, {"hash_size", INT_PARAM, &ul_hash_size }, @@ -308,14 +308,14 @@ static int mod_init(void) ul_hash_size = 1<<ul_hash_size; /* check matching mode */ - switch (matching_mode) { + switch (ul_matching_mode) { case CONTACT_ONLY: case CONTACT_CALLID: case CONTACT_PATH: case CONTACT_CALLID_ONLY: break; default: - LM_ERR("invalid matching mode %d\n", matching_mode); + LM_ERR("invalid matching mode %d\n", ul_matching_mode); } /* Register cache timer */ diff --git a/src/modules/usrloc/usrloc_mod.h b/src/modules/usrloc/usrloc_mod.h index 4b0fa35671..12735f11ee 100644 --- a/src/modules/usrloc/usrloc_mod.h +++ b/src/modules/usrloc/usrloc_mod.h @@ -111,7 +111,7 @@ extern unsigned int ul_db_srvid; #define CONTACT_PATH (2) #define CONTACT_CALLID_ONLY (3) -extern int matching_mode; +extern int ul_matching_mode; extern int ul_db_ops_ruid;

1 0

[kamailio/kamailio] ul.dump with huge amount of AoR's (#1513)
by Victor K 30 Apr '18

30 Apr '18

### Description ul.dump can't work with huge amount of aor (~40K), it fail with 500, "Internal error creating aor struct". And seems it get and not free'd memory, after some calls kamcmd ul.dump / kamcmd ul.dump brief kamailio stop service with messages: ``` Apr 28 13:36:11 kamailio-c2 kamailio2[49808]: ERROR: <core> [sip_msg_clone.c:498]: sip_msg_shm_clone(): cannot allocate memory Apr 28 13:36:11 kamailio-c2 kamailio2[49808]: ERROR: dmq [worker.c:164]: add_dmq_job(): error cloning sip message Apr 28 13:36:11 kamailio-c2 kamailio2[49808]: ERROR: dmq [message.c:67]: dmq_handle_message(): failed to add dmq job Apr 28 13:36:11 kamailio-c2 kamailio2[49808]: ERROR: <core> [mem/q_malloc.c:292]: qm_find_free(): qm_find_free(0x809132000, 3976); Free fragment not found! Apr 28 13:36:11 kamailio-c2 kamailio2[49808]: ERROR: <core> [mem/q_malloc.c:425]: qm_malloc(): qm_malloc(0x809132000, 3976) called from core: sip_msg_clone.c: sip_msg_shm_clone(495), module: core; Free fragment not found! ``` ### Possible Solutions Need rewrite ul_rpc_dump() in modules/usrloc/ul_rpc.c to aor-by-aor print. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.0-dev6 (x86_64/freebsd) 9fe51e-dirty 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, FAST_LOCK-ADAPTIVE_WAIT, USE_POSIX_SEM, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: 9fe51e -dirty compiled on 10:49:57 Nov 18 2016 with cc 3.4 ``` * **Operating System**: ``` FreeBSD kamailio-c2 10.3-STABLE FreeBSD 10.3-STABLE #0 r306194 ``` -- 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/1513

2 2

git:master:aeab281d: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: aeab281d0db468afb3175cf7511ff2d689984bf6 URL: https://github.com/kamailio/kamailio/commit/aeab281d0db468afb3175cf7511ff2d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-30T08:31:54+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/aeab281d0db468afb3175cf7511ff2d… Patch: https://github.com/kamailio/kamailio/commit/aeab281d0db468afb3175cf7511ff2d…

1 0

git:master:0ae7e001: tm: docs for t_send_reply()
by Daniel-Constantin Mierla 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: 0ae7e00152538819dfe499a74f4de5e6d69ac14f URL: https://github.com/kamailio/kamailio/commit/0ae7e00152538819dfe499a74f4de5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-30T08:19:45+02:00 tm: docs for t_send_reply() --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/0ae7e00152538819dfe499a74f4de5e… Patch: https://github.com/kamailio/kamailio/commit/0ae7e00152538819dfe499a74f4de5e… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index f40b8db0bb..f9a1995e52 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -360,6 +360,40 @@ t_reply("404", "Not found"); </example> </section> + <section id="tm.f.t_send_reply"> + <title> + <function>t_semd_reply(code, reason)</function> + </title> + <para> + Creates the transaction if it does not exist (executing internally + t_newtran()) and sends a stateful reply (executing internally + t_reply()). If transaction exists, this function does not stop the + execution of config, t_reply() being still executed. + </para> + <para> + For more, see the docs for t_newtran() and t_reply(). + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>code</emphasis> - Reply code number. + </para> + </listitem> + <listitem> + <para><emphasis>reason</emphasis> - Reason string. + </para> + </listitem> + </itemizedlist> + <example> + <title><function>t_send_reply</function> usage</title> + <programlisting> +... +t_send_reply("404", "Not found"); +... + </programlisting> + </example> + </section> + <section id="tm.f.t_lookup_request"> <title> <function>t_lookup_request()</function>

1 0

git:master:672484e9: tm: added t_send_reply(code, reason)
by Daniel-Constantin Mierla 30 Apr '18

30 Apr '18

Module: kamailio Branch: master Commit: 672484e9e0be161f5f9f0b82afc027f4ef8097e4 URL: https://github.com/kamailio/kamailio/commit/672484e9e0be161f5f9f0b82afc027f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-29T07:51:59+02:00 tm: added t_send_reply(code, reason) - create the transaction if it doesn't exist and send a stateful reply --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/672484e9e0be161f5f9f0b82afc027f… Patch: https://github.com/kamailio/kamailio/commit/672484e9e0be161f5f9f0b82afc027f… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 7ec44e8b43..a7977d7003 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -111,6 +111,7 @@ static int child_init(int rank); static int w_t_check(struct sip_msg* msg, char* str, char* str2); static int w_t_lookup_cancel(struct sip_msg* msg, char* str, char* str2); static int w_t_reply(struct sip_msg* msg, char* str, char* str2); +static int w_t_send_reply(struct sip_msg* msg, char* p1, char* p2); static int w_t_release(struct sip_msg* msg, char* str, char* str2); static int w_t_retransmit_reply(struct sip_msg* p_msg, char* foo, char* bar ); static int w_t_newtran(struct sip_msg* p_msg, char* foo, char* bar ); @@ -241,7 +242,9 @@ static cmd_export_t cmds[]={ REQUEST_ROUTE}, {"t_lookup_cancel", w_t_lookup_cancel, 1, fixup_int_1, REQUEST_ROUTE}, - {"t_reply", w_t_reply, 2, fixup_t_reply, + {"t_reply", w_t_reply, 2, fixup_t_reply, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE }, + {"t_send_reply", w_t_send_reply, 2, fixup_t_reply, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE }, {"t_retransmit_reply", w_t_retransmit_reply, 0, 0, REQUEST_ROUTE}, @@ -1390,6 +1393,49 @@ static int w_t_reply(struct sip_msg* msg, char* p1, char* p2) return ki_t_reply(msg, code, &reason); } +/** + * + */ +static int ki_t_send_reply(sip_msg_t* msg, int code, str* reason) +{ + int ret; + + ret = t_newtran(msg); + if (ret==0) { + LM_NOTICE("transaction already in process %p\n", get_t()); + } + + return ki_t_reply(msg, code, reason); +} + +/** + * + */ +static int w_t_send_reply(struct sip_msg* msg, char* p1, char* p2) +{ + int code; + str reason; + + if (msg->REQ_METHOD==METHOD_ACK) { + LM_DBG("ACKs are not replied\n"); + return -1; + } + + if (get_int_fparam(&code, msg, (fparam_t*)p1) < 0) { + code = cfg_get(tm, tm_cfg, default_code); + } + + if (get_str_fparam(&reason, msg, (fparam_t*)p2) < 0) { + reason.s = cfg_get(tm, tm_cfg, default_reason); + reason.len = strlen(reason.s); + } + + return ki_t_send_reply(msg, code, &reason); +} + +/** + * + */ static int t_release(sip_msg_t* msg) { struct cell *t; @@ -2760,6 +2806,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_send_reply"), + SR_KEMIP_INT, ki_t_send_reply, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_check_trans"), SR_KEMIP_INT, t_check_trans, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] nathelper: it doesn't ping contacts if ping_nated_only=0 (#1515)
by Konstantin 29 Apr '18

29 Apr '18

#### 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 - if ping_nated_only=0, module should send pings to all contacts, but it sends them only in nat flags are specified. We need to test additional condition if ping_nated_only=0 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1515 -- Commit Summary -- * Incorrect date format used to query contacts by expire time. * nathelper: it doesn't ping contacts if ping_nated_only=0 -- File Changes -- M src/modules/nathelper/nathelper.c (7) M src/modules/usrloc/dlist.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1515.patch https://github.com/kamailio/kamailio/pull/1515.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/1515

1 1

git:master:a6c3b35d: tm: removed no longer necessary wrapers for kemi t_reply() export
by Daniel-Constantin Mierla 27 Apr '18

27 Apr '18

Module: kamailio Branch: master Commit: a6c3b35dde900c718d8d010b0b8094b384b890d8 URL: https://github.com/kamailio/kamailio/commit/a6c3b35dde900c718d8d010b0b8094b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-27T11:55:10+02:00 tm: removed no longer necessary wrapers for kemi t_reply() export --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/a6c3b35dde900c718d8d010b0b8094b… Patch: https://github.com/kamailio/kamailio/commit/a6c3b35dde900c718d8d010b0b8094b… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 3c27675baf..7ec44e8b43 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1311,7 +1311,10 @@ static int w_t_forward_nonack_to( struct sip_msg *p_msg , return r; } -static int t_reply_helper(sip_msg_t* msg, int code, str* reason) +/** + * + */ +static int ki_t_reply(sip_msg_t* msg, int code, str* reason) { tm_cell_t *t = NULL; int ret = -1; @@ -1320,6 +1323,7 @@ static int t_reply_helper(sip_msg_t* msg, int code, str* reason) LM_DBG("ACKs are not replied\n"); return -1; } + if (t_check( msg , 0 )==-1) return -1; t=get_t(); if (!t) { @@ -1327,23 +1331,24 @@ static int t_reply_helper(sip_msg_t* msg, int code, str* reason) " for which no T-state has been established\n"); return -1; } + /* if called from reply_route, make sure that unsafe version * is called; we are already in a mutex and another mutex in * the safe version would lead to a deadlock */ - t->flags |= T_ADMIN_REPLY; if (is_route_type(FAILURE_ROUTE)) { LM_DBG("t_reply_unsafe called from w_t_reply\n"); - ret = t_reply_str_unsafe(t, msg, code, reason); + ret = t_reply_str_unsafe(t, msg, (unsigned int)code, reason); } else if (is_route_type(REQUEST_ROUTE)) { - ret = t_reply_str( t, msg, code, reason); + ret = t_reply_str( t, msg, (unsigned int)code, reason); } else if (is_route_type(ONREPLY_ROUTE)) { if (likely(t->uas.request)){ if (is_route_type(CORE_ONREPLY_ROUTE)) - ret=t_reply_str(t, t->uas.request, code, reason); + ret=t_reply_str(t, t->uas.request, (unsigned int)code, reason); else - ret=t_reply_str_unsafe(t, t->uas.request, code, reason); + ret=t_reply_str_unsafe(t, t->uas.request, (unsigned int)code, + reason); }else ret=-1; /* t_check() above has the side effect of setting T and @@ -1382,10 +1387,9 @@ static int w_t_reply(struct sip_msg* msg, char* p1, char* p2) reason.len = strlen(reason.s); } - return t_reply_helper(msg, code, &reason); + return ki_t_reply(msg, code, &reason); } - static int t_release(sip_msg_t* msg) { struct cell *t; @@ -2254,24 +2258,6 @@ static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar) return ki_t_save_lumps(msg); } -/* wrapper function needed after changes in w_t_reply */ -int w_t_reply_wrp(struct sip_msg *m, unsigned int code, char *txt) -{ - fparam_t c; - fparam_t r; - - c.type = FPARAM_INT; - c.orig = NULL; /* ? */ - c.v.i = code; - - r.type = FPARAM_STRING; - r.orig = NULL; /* ? */ - r.v.asciiz = txt; - - return w_t_reply(m, (char *)&c, (char*)&r); -} - - /** script function, check if a msg is assoc. to a transaction. * @return -1 (not), 1 (reply, e2e ack or cancel for an existing transaction), @@ -2740,14 +2726,6 @@ static int ki_t_relay(sip_msg_t *msg) return _w_t_relay_to(msg, (struct proxy_l *)0, PROTO_NONE); } -/** - * - */ -static int ki_t_reply(sip_msg_t *msg, int code, str *reason) -{ - return w_t_reply_wrp(msg, (unsigned int)code, reason->s); -} - /** * */

1 0

git:master:162d7feb: tm: avoid temporary clone of reason value for t_reply()
by Daniel-Constantin Mierla 27 Apr '18

27 Apr '18

Module: kamailio Branch: master Commit: 162d7feb00cf5d51be3375a5f5c1434b6abd8a4b URL: https://github.com/kamailio/kamailio/commit/162d7feb00cf5d51be3375a5f5c1434… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-27T11:47:20+02:00 tm: avoid temporary clone of reason value for t_reply() - use str field instead of char* for internal _reply() parameter - split the w_t_reply() to config wrapper and helper functions --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_reply.h Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/162d7feb00cf5d51be3375a5f5c1434… Patch: https://github.com/kamailio/kamailio/commit/162d7feb00cf5d51be3375a5f5c1434…

1 0

git:master:9670bd80: cfgutils: update route_if_exists() to have same behaviour as route()
by Daniel-Constantin Mierla 27 Apr '18

27 Apr '18

Module: kamailio Branch: master Commit: 9670bd80550b9e0c2af1d5d61df618292346ba28 URL: https://github.com/kamailio/kamailio/commit/9670bd80550b9e0c2af1d5d61df6182… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-27T08:56:32+02:00 cfgutils: update route_if_exists() to have same behaviour as route() - do not run the route block as a top route - related to GH #1503 --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/9670bd80550b9e0c2af1d5d61df6182… Patch: https://github.com/kamailio/kamailio/commit/9670bd80550b9e0c2af1d5d61df6182… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index eedef71691..c0872ec33c 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -801,11 +801,10 @@ static int w_check_route_exists(struct sip_msg *msg, char *route) static int w_route_exists(struct sip_msg *msg, char *route) { struct run_act_ctx ctx; - int newroute, backup_rt, ret; + int newroute, ret; str s; - if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) - { + if (fixup_get_svalue(msg, (gparam_p) route, &s) != 0) { LM_ERR("invalid route parameter\n"); return -1; } @@ -814,12 +813,8 @@ static int w_route_exists(struct sip_msg *msg, char *route) if (newroute<0) { return -1; } - backup_rt = get_route_type(); - set_route_type(REQUEST_ROUTE); - init_run_actions_ctx(&ctx); - ret = run_top_route(main_rt.rlist[newroute], msg, &ctx); - set_route_type(backup_rt); + ret=run_actions(&ctx, main_rt.rlist[newroute], msg); if (ctx.run_flags & EXIT_R_F) { return 0; }

1 0

git:master:100a4be2: pkg/kamailio/deb: version set to 5.2.0~dev5
by Victor Seva 26 Apr '18

26 Apr '18

Module: kamailio Branch: master Commit: 100a4be2b270e8a8331ba476842e5f7e1eabc1ea URL: https://github.com/kamailio/kamailio/commit/100a4be2b270e8a8331ba476842e5f7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-04-26T14:06:14+02:00 pkg/kamailio/deb: version set to 5.2.0~dev5 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/100a4be2b270e8a8331ba476842e5f7… Patch: https://github.com/kamailio/kamailio/commit/100a4be2b270e8a8331ba476842e5f7… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 38fdee4027..b8ec259779 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev5) unstable; urgency=medium + + * version set 5.2.0-dev5 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Apr 2018 14:05:28 +0200 + kamailio (5.2.0~dev4) unstable; urgency=medium * version set 5.2.0-dev4 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 38fdee4027..b8ec259779 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev5) unstable; urgency=medium + + * version set 5.2.0-dev5 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Apr 2018 14:05:28 +0200 + kamailio (5.2.0~dev4) unstable; urgency=medium * version set 5.2.0-dev4 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 38fdee4027..b8ec259779 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev5) unstable; urgency=medium + + * version set 5.2.0-dev5 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Apr 2018 14:05:28 +0200 + kamailio (5.2.0~dev4) unstable; urgency=medium * version set 5.2.0-dev4 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 38fdee4027..b8ec259779 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev5) unstable; urgency=medium + + * version set 5.2.0-dev5 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Apr 2018 14:05:28 +0200 + kamailio (5.2.0~dev4) unstable; urgency=medium * version set 5.2.0-dev4 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 38fdee4027..b8ec259779 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev5) unstable; urgency=medium + + * version set 5.2.0-dev5 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Apr 2018 14:05:28 +0200 + kamailio (5.2.0~dev4) unstable; urgency=medium * version set 5.2.0-dev4 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 38fdee4027..b8ec259779 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev5) unstable; urgency=medium + + * version set 5.2.0-dev5 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Apr 2018 14:05:28 +0200 + kamailio (5.2.0~dev4) unstable; urgency=medium * version set 5.2.0-dev4 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 38fdee4027..b8ec259779 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev5) unstable; urgency=medium + + * version set 5.2.0-dev5 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Apr 2018 14:05:28 +0200 + kamailio (5.2.0~dev4) unstable; urgency=medium * version set 5.2.0-dev4 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 38fdee4027..b8ec259779 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev5) unstable; urgency=medium + + * version set 5.2.0-dev5 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Apr 2018 14:05:28 +0200 + kamailio (5.2.0~dev4) unstable; urgency=medium * version set 5.2.0-dev4 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 38fdee4027..b8ec259779 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.2.0~dev5) unstable; urgency=medium + + * version set 5.2.0-dev5 + + -- Victor Seva <vseva(a)debian.org> Thu, 26 Apr 2018 14:05:28 +0200 + kamailio (5.2.0~dev4) unstable; urgency=medium * version set 5.2.0-dev4

1 0

git:master:dc647da7: Makefile.defs: version set to 5.2.0-dev5
by Daniel-Constantin Mierla 26 Apr '18

26 Apr '18

Module: kamailio Branch: master Commit: dc647da7f2a8eb7b634a98d53ad1726d61f79b9b URL: https://github.com/kamailio/kamailio/commit/dc647da7f2a8eb7b634a98d53ad1726… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-26T14:03:22+02:00 Makefile.defs: version set to 5.2.0-dev5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/dc647da7f2a8eb7b634a98d53ad1726… Patch: https://github.com/kamailio/kamailio/commit/dc647da7f2a8eb7b634a98d53ad1726… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 076e4e9192..a470e0ce7b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -dev5 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] do not fragment flag (#1510)
by sergey-safarov 26 Apr '18

26 Apr '18

looks as `do not fragment` flag is applied to TCP transport by default Later will test on default config. -- 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/1510

2 5

git:5.1:f0dce0c9: ims_charging: Use the "custom_user_avp" also in other places, where the user is retrieved (aligning request with the docs)
by Carsten Bock 26 Apr '18

26 Apr '18

Module: kamailio Branch: 5.1 Commit: f0dce0c9992929b57bc1a9161af73e3692119926 URL: https://github.com/kamailio/kamailio/commit/f0dce0c9992929b57bc1a9161af73e3… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2018-04-26T11:39:20+02:00 ims_charging: Use the "custom_user_avp" also in other places, where the user is retrieved (aligning request with the docs) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/f0dce0c9992929b57bc1a9161af73e3… Patch: https://github.com/kamailio/kamailio/commit/f0dce0c9992929b57bc1a9161af73e3…

1 0

git:master:43d66872: ims_charging: Use the "custom_user_avp" also in other places, where the user is retrieved (aligning request with the docs)
by Carsten Bock 26 Apr '18

26 Apr '18

Module: kamailio Branch: master Commit: 43d66872cd585c25133d1702f17bd839d1864c1a URL: https://github.com/kamailio/kamailio/commit/43d66872cd585c25133d1702f17bd83… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2018-04-26T11:38:44+02:00 ims_charging: Use the "custom_user_avp" also in other places, where the user is retrieved (aligning request with the docs) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/43d66872cd585c25133d1702f17bd83… Patch: https://github.com/kamailio/kamailio/commit/43d66872cd585c25133d1702f17bd83…

1 0

git:5.0:49bd81ad: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 25 Apr '18

25 Apr '18

Module: kamailio Branch: 5.0 Commit: 49bd81ad7856dac9b2efd53597fb1c182de7440b URL: https://github.com/kamailio/kamailio/commit/49bd81ad7856dac9b2efd53597fb1c1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-25T18:31:25+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/jsonrpcs/README Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/49bd81ad7856dac9b2efd53597fb1c1… Patch: https://github.com/kamailio/kamailio/commit/49bd81ad7856dac9b2efd53597fb1c1… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index d615babde5..57c8e1e69c 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -397,6 +397,7 @@ event_route[xhttp:request] { Example 1.15. jsonrpc_exec usage ... jsonrpc_exec('{"jsonrpc": "2.0", "method": "dispatcher.reload", "id": 1}'); +xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); ... 6. JSONRPC Commands diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 38d00646e3..c47af074cd 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -204,7 +204,7 @@ Chapter 1. Admin Guide from outside to inside); As many NATs do update the bind timeout only on outbound traffic, the bind may expire and closed. - * SIP request - a stateless SIP request is sent to the contact + * SIP request - a stateless SIP request is sent to the UDP contact address. + Advantages: bidirectional traffic through NAT, since each PING request from Kamailio (inbound traffic) will force the SIP

1 0

git: new commits in branch 5.0
by Daniel-Constantin Mierla 25 Apr '18

25 Apr '18

- URL: https://github.com/kamailio/kamailio/commit/47e008c021c563c26b9cf47c13ef3c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:11:31+02:00 db_mongodb: create projection field to set the list of returned column (cherry picked from commit d50498cf483cd22ac4e62af5aaa86fc27654f640) (cherry picked from commit cc92737d06359d1812ec7bed22e4c253ae7ba2e9) - URL: https://github.com/kamailio/kamailio/commit/74f751565923668c5964f417549719b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:11:43+02:00 db_mongodb: iterate on projection fields for matching cols in result (cherry picked from commit aab4f5db964bf1980729ed8b7770f550bb86b72b) (cherry picked from commit ece17deeba435ed19c16fc2a227d351fd6013f86) - URL: https://github.com/kamailio/kamailio/commit/79e2934a8ac0880ba00b7eb7c40008b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:11:57+02:00 db_mongodb: use projection iterator to convert bson for result (cherry picked from commit 899ab355fb58e22eaa02336e9b5b1f2f53dba375) (cherry picked from commit 49dee7f498e1001ce3e29c1691a7ec322392baca) - URL: https://github.com/kamailio/kamailio/commit/c1a57ed7fbbe9a487f5f6ccf4df7f98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:12:29+02:00 kamctl: fixed the name of rpc command for dialplan reload (cherry picked from commit 9b7bb4ea6c100f5f33d2dddc9061febf33c47f5e) (cherry picked from commit 4c840b7e9144e0540e97be5c9d3444b38a901a27) - URL: https://github.com/kamailio/kamailio/commit/794292b1d24a8ae615627d06d0305ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:12:45+02:00 core: check return of dlsym() before dlerror() handling - cope with the case when dlerror is not reset by dlsym - related to GH #1465 (cherry picked from commit 045d44762ce7cd267e64849c1c138d45b1fa040f) (cherry picked from commit 289eb37432bfc61855234893daa6be27d40f8788) - URL: https://github.com/kamailio/kamailio/commit/a126490fca53d4f2b1cc6f5f877df55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:12:56+02:00 app_perl: do dlerror() after dlsym() fails to find exports - some OSes do not reset dlerror after a successful dlsym(), pointing to an older error case - reported by GH #1465 (cherry picked from commit 795edca9215391f7c8f646895c083f8ac8853341) (cherry picked from commit 48c8f7751d701c8a6dd538280c5c1fa6129d141d) - URL: https://github.com/kamailio/kamailio/commit/b017462a1a84b2e80e626bc2ca0d9ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:13:12+02:00 kamctl: set default PID_FILE to /var/run/kamailio/kamailio.pid - this being now the path used by default kamailio options (cherry picked from commit 6abd8472b764f88c5c054becb440fda8fff47349) (cherry picked from commit 6e2ab8089fd4d4b3ca0a23e240765474e6648b3c) - URL: https://github.com/kamailio/kamailio/commit/fac42c3c8b9e755bca0e6ee35bbaebf… Author: kelchy <kelchy(a)gmail.com> Date: 2018-04-25T18:13:29+02:00 db_mongodb: add error logger for failed query (cherry picked from commit 2a5d66fda013197aa5fbe4828cc7f6e61a74a9d6) (cherry picked from commit 63c93af189e7e5db92a392e0d176e71bda64290e) - URL: https://github.com/kamailio/kamailio/commit/c30cbc31ce8c87c3cc2c60470272d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:13:43+02:00 db_mongodb: check mongo-c-driver version at least 1.5.0 to use projection - reported by GH #1479 (cherry picked from commit cdbee5a536920c4fab3ec619c8467c152d6f110a) (cherry picked from commit 5f5f2638b50e079717952b5b279529e7647ce684) - URL: https://github.com/kamailio/kamailio/commit/5eada53be7c363627d53730518d314d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:13:57+02:00 nathelper: docs - mention UDP for SIP nat pinging contact addresses (cherry picked from commit 82efea41d7a01c041ea6ff85cc864cfdf2fd1ba5) (cherry picked from commit 2f66b1dfe12455534f94060a0f68bc3f8ac0f81d) - URL: https://github.com/kamailio/kamailio/commit/eade4a27d8a72f18b8a1325da886078… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:14:14+02:00 misc/examples/kemi: enable lua script reload in example config (cherry picked from commit e129965129b2377970a28fabd26b3be9b483c81b) (cherry picked from commit 3994fcd94e1d3291f4d14083f12b85a3b11ca148) - URL: https://github.com/kamailio/kamailio/commit/d0820114f286a36bd4a1675be6e243d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:14:24+02:00 auth_ephemeral: do pkg-config for libcrypto if exists - discover all the libs to link against - related to GH #1473 (cherry picked from commit 021e7e53585f78b56356c98f25bd731c51f96f9a) (cherry picked from commit 5df0d505d220addf43f459b29cc80f9aecef19dc) - URL: https://github.com/kamailio/kamailio/commit/17faf9e086891544a870befbe27c954… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:16:16+02:00 core: check for result of dlopen() pointers (cherry picked from commit a3d9816d3881eb9743a14cb1306533469a821d47) (cherry picked from commit 760aee932aafc7f4c0207c10aabb5a094fd975dd) - URL: https://github.com/kamailio/kamailio/commit/5a216d183dfb2560da11ab3c74576f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:16:49+02:00 jsonrpcs: example accessing the jsonrpc response for jsonrpc_exec() (cherry picked from commit 0fcac52fc9e6445f986c9a5a9ee1b5230030035b) (cherry picked from commit e4f1a229068e0cd774a32b4db4431aac6fbf5555) - URL: https://github.com/kamailio/kamailio/commit/1a5a3258e27b996b94ade8cdbb897ee… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-25T18:16:58+02:00 ipops: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) (cherry picked from commit 3848b5286b74894ed162e1aae8c80ee3d703c21f) (cherry picked from commit 7153e802288112658c6012488867596aba6232ac) - URL: https://github.com/kamailio/kamailio/commit/a8c0d3dd36cb8d9cb8a3beacec34e30… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-25T18:17:20+02:00 nathelper: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) (cherry picked from commit 804d6b85bdbe55b32edacdbd895b0ad763bf619f) (cherry picked from commit 742f4924eb515d6b481b8295fb611e723619ebe0) - URL: https://github.com/kamailio/kamailio/commit/90f618da4214bd8c49fff9e5188001b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:17:32+02:00 dialog: skip printing profiles and vars in terminated state for rpc dialog list - they can be delelted at that point, not being referenced by the same field (cherry picked from commit 8bc037bc87ced907b8b2e59a2c5fcb45291836fd) (cherry picked from commit 9be00ceba0d814f6ad973279fc386d60b5c8e9ac) - URL: https://github.com/kamailio/kamailio/commit/a2d82eb5c3128fc0babd6bc86ea0c5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T18:17:50+02:00 app_lua: test if number of parameters is enough for kemi funtions (cherry picked from commit cc661d776621a5f2d4370eb364402c2a53242cc7) (cherry picked from commit a0f8f33c5197b4fee5c2dedc85abbdb9e836b152) - URL: https://github.com/kamailio/kamailio/commit/8409b453c8c236bced02884f0bd22f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-04-25T18:18:35+02:00 ndb_mongodb: fix deprecation warning Since 1.5.0 mongoc_collection_find() is deprecated > http://mongoc.org/libmongoc/1.5.0/mongoc_collection_find.html (cherry picked from commit c70d831aee5a95613de69568d8f1863788e0a074) (cherry picked from commit 11ee34a0edca1eaf942fdf9825f1a75c3f2f5648) - URL: https://github.com/kamailio/kamailio/commit/9b77b620e5d8b20f37790e22a59a7d3… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-04-25T18:18:48+02:00 dialog: restore keep-alive after restart (cherry picked from commit a821ff61029a4e8a9f220d60f95bd7b5a545f9b4) (cherry picked from commit ffa97a1b920df367e23f88cd6c6a4bdb9401fec4) - URL: https://github.com/kamailio/kamailio/commit/bc2e4133f18113483b2d3ab9fee6d5d… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-04-25T18:19:00+02:00 dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value (cherry picked from commit ad427fc19c56110f66df86b7b49e23c00313610a) (cherry picked from commit b89f643e12ac6359b4ffd9c173fee4870992b31a) - URL: https://github.com/kamailio/kamailio/commit/527283593baa3d3e7321b0f3904d4a7… Author: lyokha <alexey.radkov(a)gmail.com> Date: 2018-04-25T18:19:25+02:00 textops: reinitialize new tr_param_t object for tr_txt_parse_re() - avoid segfault when running fparam_free_restore() on such an object immediately after creation, because its field "next" contains garbage (cherry picked from commit 38b8fbdf940b273cf541678fd22af7dd4d63ab3d) (cherry picked from commit 5f5f7fd506bbde1ac159cbebf133e499dc06427a)

1 0

[kamailio/kamailio] Kamailio doesn't start with db_mongodb and usrloc. (#1507)
by Konstantin 25 Apr '18

25 Apr '18

### Description Kamailio doesn't start with db_mongodb and usrloc. Configuration: kamailio 4.4.7 (tried to use db_mongodb module from 5.1.2) usrloc is configured to use db_mode=1 and db_insert_null=1. MongoDB 3.0.2 and 3.6.3 mongo-c-driver was tested 1.9.2 and 1.9.4. location table contains 300 records. ### Troubleshooting #### Reproduction 1. Configure db_mode=1 (use internal cache). 2. Make 300 successful registrations to have 300 records inside mongodb. 3. Restart Kamailio #### Debugging Data db_mongodb_base.c function db_mongodb_convert_bson() line 614 #### Log Messages 0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:469]: preload_udomain(): loading records - cycle [1] [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <s>...ignoring [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [gs] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [gs] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [gs] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [gs] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [gs] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [gs] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [gs] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [gs] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <gs>...ignoring [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [s] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <s>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:256]: dbrow2info(): bad callid [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [udomain.c:484]: preload_udomain(): skipping record for kgate.zz in table location [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [t] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [t] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [t] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [t] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [t] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [t] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 1==15 && [t] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 1==15 && [t] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <t>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <received>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [received] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <received>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:256]: dbrow2info(): bad callid [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [udomain.c:484]: preload_udomain(): skipping record for Þñª(%Brusername in table location [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:256]: dbrow2info(): bad callid [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [udomain.c:484]: preload_udomain(): skipping record for ª(%Bsusername in table location [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:231]: dbrow2info(): bad contact [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [udomain.c:484]: preload_udomain(): skipping record for %Btusername in table location [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 3==15 && [ket] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 3==15 && [ket] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 3==15 && [ket] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 3==15 && [ket] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 3==15 && [ket] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 3==15 && [ket] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 3==15 && [ket] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 3==15 && [ket] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <ket>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:492]: preload_udomain(): empty domain record for user ame...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 15==15 && [192.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 15==15 && [192.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 16060 (advertise 16060) matches port 16060 [0;39;49m[0;35;49m 1(13464) WARNING: usrloc [../../ut.h:717]: shm_str_dup(): shm_str_dup fallback; dup called for src->s == NULL or src->len < 0 [0;39;49m[0;35;49m 1(13464) WARNING: usrloc [../../ut.h:731]: shm_str_dup(): shm_str_dup fallback; skip memcpy for src->s == NULL [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 16060 (advertise 16060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 16060 (advertise 16060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <.168.158.178:16060>...ignoring [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 15==15 && [192.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 15==15 && [192.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 16060 (advertise 16060) matches port 16060 [0;39;49m[0;35;49m 1(13464) WARNING: usrloc [../../ut.h:717]: shm_str_dup(): shm_str_dup fallback; dup called for src->s == NULL or src->len < 0 [0;39;49m[0;35;49m 1(13464) WARNING: usrloc [../../ut.h:731]: shm_str_dup(): shm_str_dup fallback; skip memcpy for src->s == NULL [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 16060 (advertise 16060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 16060 (advertise 16060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 12==15 && [.168.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <.168.158.178:16060>...ignoring [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 9==15 && [8.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 9==15 && [8.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 16060 (advertise 16060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 9==15 && [8.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 9==15 && [8.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 9==15 && [8.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 16060 (advertise 16060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 9==15 && [8.158.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <8.158.178:16060>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:492]: preload_udomain(): empty domain record for user some.com...skipping [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 6==15 && [58.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 6==15 && [58.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 16060 (advertise 16060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 6==15 && [58.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 6==15 && [58.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 6==15 && [58.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:567]: grep_sock_info(): checking if port 16060 (advertise 16060) matches port 16060 [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 6==15 && [58.178] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <58.178:16060>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [60] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [60] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [60] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [60] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [60] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [60] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [60] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [60] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [60] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [60] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [60] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [60] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [60] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [60] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [60] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [60] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <60>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:492]: preload_udomain(): empty domain record for user tact...skipping [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [methods] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [methods] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [methods] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [methods] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [methods] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [methods] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 8==15 && [methods] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 8==15 && [methods] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <methods>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:476]: preload_udomain(): empty username record in table location...skipping [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:256]: dbrow2info(): bad callid [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [udomain.c:484]: preload_udomain(): skipping record for sip:SIPP43.some.com@192.168.158.178:5360 in table location [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <>...ignoring [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:231]: dbrow2info(): bad contact [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [udomain.c:484]: preload_udomain(): skipping record for 8.some.com@192.168.158.178:5360 in table location [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:256]: dbrow2info(): bad callid [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [udomain.c:484]: preload_udomain(): skipping record for ome.com@192.168.158.178:5360 in table location [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [ed] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [ed] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [ed] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [ed] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [ed] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [ed] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [ed] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [ed] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [ed] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [ed] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [ed] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [ed] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:564]: grep_sock_info(): checking if host==us: 2==15 && [ed] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [ed] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [socket_info.c:583]: grep_sock_info(): checking advertise if host==us: 2==15 && [ed] == [192.168.158.178] [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [resolve.h:355]: str2ip6(): str2ip6: ERROR: too few colons in [ed] [0;39;49m[0;39;49m 1(13464) DEBUG: usrloc [udomain.c:313]: dbrow2info(): non-local socket <ed>...ignoring [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:256]: dbrow2info(): bad callid [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [udomain.c:484]: preload_udomain(): skipping record for 2.168.158.178:5360 in table location [0;39;49m[0;33;49m 1(13464) CRITICAL: usrloc [udomain.c:231]: dbrow2info(): bad contact [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [udomain.c:484]: preload_udomain(): skipping record for 68.158.178:5360 in table location [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [ucontact.c:94]: new_ucontact(): no ruid for aor: 158.178:5360@e.com [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [urecord.c:149]: mem_insert_ucontact(): failed to create new contact [0;39;49m[0;31;49m 1(13464) ERROR: usrloc [udomain.c:517]: preload_udomain(): inserting contact failed [0;39;49m[0;39;49m 1(13464) DEBUG: <core> [db_res.c:79]: db_free_columns(): freeing 21 columns ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 4.4.7 (x86_64/linux) 35d8ab 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: 35d8ab compiled on 10:51:03 Apr 22 2018 with gcc 4.8.5 * **Operating System**:  ``` CentOS 7.1 Linux linux-dev 3.10.0-514.10.2.el7.x86_64 #1 SMP Fri Mar 3 00:04:05 UTC 2017 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/1507

2 3

git:5.1:f0fbe297: db_mongodb: clone bson UTF8 value into DB val structure
by Daniel-Constantin Mierla 25 Apr '18

25 Apr '18

Module: kamailio Branch: 5.1 Commit: f0fbe297a47c658b63623b2c5912cdf379b3f7fd URL: https://github.com/kamailio/kamailio/commit/f0fbe297a47c658b63623b2c5912cdf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T14:52:45+02:00 db_mongodb: clone bson UTF8 value into DB val structure - the bson iterator invalidates or reuses the memory after several interations - initial patch by Konstantin Poliakov <k.polyakov(a)mightycall.com>, GH #1508 (cherry picked from commit 1ef70d68599db092fa71b9b8b7cd3fdcd54f8a99) --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f0fbe297a47c658b63623b2c5912cdf… Patch: https://github.com/kamailio/kamailio/commit/f0fbe297a47c658b63623b2c5912cdf… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 72d6647689..4b75c0d3a1 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -630,7 +630,13 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, break; case BSON_TYPE_UTF8: - VAL_STRING(dval) = (char*)bson_iter_utf8 (piter, &i32tmp); + { + char* rstring = (char*)bson_iter_utf8 (piter, &i32tmp); + if(db_str2val(DB1_STRING, dval, rstring, i32tmp, 1)<0) { + LM_ERR("failed to convert utf8 value\n"); + return -5; + } + } break; case BSON_TYPE_OID:

1 0

[kamailio/kamailio] Kamailio ims_charging module handles Result-Code AVP inside MSCC AVP as a mandatory AVP (#1505)
by yuri-r 25 Apr '18

25 Apr '18

### Description Incoming Invite triggers CCR toward OCS. In CCA with Result-Code DIAMETER_SUCCESS (2001) missing Result-Code in Multiple-Services-Credit-Control AVP. Kamailio handles this successful charging transaction as a failure in the following lines: if (ro_cca_data->mscc->resultcode != 2001) { LM_DBG("CCA failure at MSCC level with resultcode [%d]\n", ro_cca_data->mscc->resultcode); error_code = RO_RETURN_FALSE; goto error1; } The resultcode is mandatory in this statement, so if Multiple-Services-Credit-Control AVP does not contain Result-Code which is optional according to RFC 4006 the charging transaction is considered as failed. #### Reproduction To reproduce the issue the diameter CCA should look as following: Diameter Protocol Version: 0x01 Length: 392 Flags: 0x40, Proxyable Command Code: 272 Credit-Control ApplicationId: Diameter Credit Control Application (4) Hop-by-Hop Identifier: 0x66ea324d End-to-End Identifier: 0x8777d597 [Request In: 2623] [Response Time: 0.457246000 seconds] AVP: Session-Id(263) l=52 f=-M- val=ar.voice-pre-5.domain.int;843835511;1 **AVP: Result-Code(268) l=12 f=-M- val=DIAMETER_SUCCESS (2001)** AVP: Auth-Application-Id(258) l=12 f=-M- val=Diameter Credit Control Application (4) AVP: CC-Request-Type(416) l=12 f=-M- val=INITIAL_REQUEST (1) AVP: CC-Request-Number(415) l=12 f=-M- val=0 AVP: CC-Session-Failover(418) l=12 f=-M- val=FAILOVER_NOT_SUPPORTED (0) AVP: Unknown(12018) l=45 f=VM- vnd=12239 val=31363239386664653539382d303030303465363864343333... AVP: Unknown(12019) l=76 f=VM- vnd=12239 val=00002ef4c000001800002fcf532e5441522e30302e303030... AVP: Unknown(12011) l=16 f=VM- vnd=12239 val=00000000 **AVP: Multiple-Services-Credit-Control(456) l=56 f=-M- AVP Code: 456 Multiple-Services-Credit-Control AVP Flags: 0x40 AVP Length: 56 Multiple-Services-Credit-Control: 000001af40000014000001a44000000c0000005a00000364... AVP: Granted-Service-Unit(431) l=20 f=-M- AVP: Time-Quota-Threshold(868) l=16 f=V-- vnd=TGPP val=127.0.0.1** AVP: Origin-Host(264) l=15 f=-M- val=sim-dra AVP: Origin-Realm(296) l=29 f=-M- val=tlf-ar.ocs.com ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 13:24:45 Apr 7 2018 with gcc 4.9.2 ``` * **Operating System**: ``` Linux voice-pre-5 4.9.0-0.bpo.2-amd64 #1 SMP Debian 4.9.18-1~bpo8+1 (2017-04-10) 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/1505

2 2

[kamailio/kamailio] cannot build 5.1 branch on Alpine (#1509)
by sergey-safarov 25 Apr '18

25 Apr '18

Set of errors during kamailio build on alpine. ``` CC (gcc) [M tls.so] tls_verify.o CC (gcc) [M tls.so] tls_ct_wrq.o CC (gcc) [M tls.so] tls_rpc.o CC (gcc) [M tls.so] tls_bio.o tls_bio.c:88:14: error: static declaration of 'BIO_get_data' follows non-static declaration static void *BIO_get_data(BIO *b) ^~~~~~~~~~~~ In file included from tls_bio.h:27:0, from tls_bio.c:25: /usr/include/openssl/bio.h:608:8: note: previous declaration of 'BIO_get_data' was here void *BIO_get_data(BIO *a); ^~~~~~~~~~~~ tls_bio.c:92:13: error: static declaration of 'BIO_set_data' follows non-static declaration static void BIO_set_data(BIO *b, void *ptr) ^~~~~~~~~~~~ In file included from tls_bio.h:27:0, from tls_bio.c:25: /usr/include/openssl/bio.h:609:7: note: previous declaration of 'BIO_set_data' was here void BIO_set_data(BIO *a, void *ptr); ^~~~~~~~~~~~ tls_bio.c:96:13: error: static declaration of 'BIO_set_init' follows non-static declaration static void BIO_set_init(BIO *b, int init) ^~~~~~~~~~~~ In file included from tls_bio.h:27:0, from tls_bio.c:25: /usr/include/openssl/bio.h:610:7: note: previous declaration of 'BIO_set_init' was here void BIO_set_init(BIO *a, int init); ^~~~~~~~~~~~ make[2]: *** [../../Makefile.rules:100: tls_bio.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [Makefile:511: modules] Error 1 make: *** [Makefile:27: all] Error 2 make[1]: Leaving directory '/usr/src/kamailio/pkg/kamailio/alpine/src/kamailio-25c4b9eb56e0c75daaa98256c590947daa2b9906/src' >>> ERROR: kamailio: all failed >>> kamailio: Uninstalling dependencies... (1/1) Purging .makedepends-kamailio (0) OK: 448 MiB in 141 packages pre_build hook failed! (1) ``` First failed build on commit 25c4b9eb56e0c75daaa98256c590947daa2b9906 Look as this commit not related to `tls` and think issue may be on alpine dist change. -- 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/1509

3 8

[kamailio/kamailio] Replaced working with bson utf8 string inside db_mongodb_convert_bson function (#1508)
by Konstantin 25 Apr '18

25 Apr '18

#### 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  During query operations string fields inside result structure db1_res_t could be corrupted because of incorrect usage of bson memory. This issue is reproduced when we need to read more than 150 documents from the database. So that is why this issue still exists. Firstly bson_iter_utf8 function returns pointer to memory which is allocated inside bson memory and which is used multiple times. So the data must be copied into Kamailio memory instead storing that pointer. The pointer becomes invalid after some time. Secondly, this pointer must not be freed by the caller of bson_iter_utf8. At the current version bson allocated pointer is freed by Kamailio function pkg_free like it is was allocated by pkg_malloc. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1508 -- Commit Summary -- * Fixed db_mongodb module. UTF8 string must be copied into Kamailio memory. * Fixed indentation. -- File Changes -- M src/modules/db_mongodb/mongodb_dbase.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1508.patch https://github.com/kamailio/kamailio/pull/1508.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/1508

2 3

git:master:1ef70d68: db_mongodb: clone bson UTF8 value into DB val structure
by Daniel-Constantin Mierla 25 Apr '18

25 Apr '18

Module: kamailio Branch: master Commit: 1ef70d68599db092fa71b9b8b7cd3fdcd54f8a99 URL: https://github.com/kamailio/kamailio/commit/1ef70d68599db092fa71b9b8b7cd3fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T14:43:42+02:00 db_mongodb: clone bson UTF8 value into DB val structure - the bson iterator invalidates or reuses the memory after several interations - initial patch by Konstantin Poliakov <k.polyakov(a)mightycall.com>, GH #1508 --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/1ef70d68599db092fa71b9b8b7cd3fd… Patch: https://github.com/kamailio/kamailio/commit/1ef70d68599db092fa71b9b8b7cd3fd… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 91207973f1..5e8e63d618 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -632,7 +632,13 @@ static int db_mongodb_convert_bson(const db1_con_t* _h, db1_res_t* _r, break; case BSON_TYPE_UTF8: - VAL_STRING(dval) = (char*)bson_iter_utf8 (piter, &i32tmp); + { + char* rstring = (char*)bson_iter_utf8 (piter, &i32tmp); + if(db_str2val(DB1_STRING, dval, rstring, i32tmp, 1)<0) { + LM_ERR("failed to convert utf8 value\n"); + return -5; + } + } break; case BSON_TYPE_OID:

1 0

[kamailio/kamailio] EVAPI generating disconnect event 3 times (#1512)
by Teofil Voivozeanu 25 Apr '18

25 Apr '18

### Description Hi everyone. I integrate Kamailio with CGRateS and found a strange behaviour. I made a call using Jitsi from 1001 to 1003 (configured before in CGRateS to disconnect after 12 seconds). The call is disconnected correctly but from Kamailio got 3 CGR_CALL_END events with the same data which in CGRateS generate an error because from these events CGRateS generate 3 cdrs and all 3 with the same unique key. Is this a bug or is something wrong with the config? Kamailio config : https://github.com/cgrates/cgrates/tree/master/data/tutorials/kamevapi/kama… ### NGREP Events between CGRateS and Kamailio T 2018/04/24 07:55:14.200094 127.0.0.1:8448 -> 127.0.0.1:36774 [AP] 269:{"event":"CGR_AUTH_REQUEST", .."tr_index":"12566", .."tr_label":"1148670067", .."cgr_subsystems":"*attributes;*resources;*accounts;*suppliers", .."RequestType":"*prepaid", .."Tenant":"cgrates.org", .."Account":"1001", .."Destination":"1003", .."SetupTime":"1524570914"}, ## T 2018/04/24 07:55:14.227815 127.0.0.1:36774 -> 127.0.0.1:8448 [AP] 214:{"Event":"CGR_AUTH_REPLY","TransactionIndex":"12566","TransactionLabel":"1148670067","Attributes":"","ResourceAllocation":"SPECIAL_1003","MaxUsage":13,"Suppliers":"supplier2,supplier1","ThresholdHits":0,"Error":""}, ## T 2018/04/24 07:55:17.538695 127.0.0.1:8448 -> 127.0.0.1:36774 [AP] 306:{"event":"CGR_CALL_START", .."h_entry":"226", .."h_id":"8446", .."cgr_subsystems":"*resources;*accounts", .."OriginID":"f1c3db6e9aea754291eed5cdc944cdd2@0:0:0:0:0:0:0:0;2fc2c199", .."RequestType":"*prepaid", .."Tenant":"cgrates.org", .."Account":"1001", .."Destination":"1003", .."AnswerTime":"1524570917"}, ## T 2018/04/24 07:55:29.546055 127.0.0.1:36774 -> 127.0.0.1:8448 [AP] 99:{"Event":"CGR_SESSION_DISCONNECT","HashEntry":"226","HashId":"8446","Reason":"INSUFFICIENT_CREDIT"}, ## T 2018/04/24 07:55:29.546285 127.0.0.1:8448 -> 127.0.0.1:36774 [AP] 285:{"event":"CGR_CALL_END", .."cgr_subsystems":"*resources;*accounts", .."OriginID":"f1c3db6e9aea754291eed5cdc944cdd2@0:0:0:0:0:0:0:0;2fc2c199", .."RequestType":"*prepaid", .."Tenant":"cgrates.org", .."Account":"1001", .."Destination":"1003", .."AnswerTime":"1524570917", .."Usage":"12"}, ## T 2018/04/24 07:55:29.546561 127.0.0.1:8448 -> 127.0.0.1:36774 [AP] 285:{"event":"CGR_CALL_END", .."cgr_subsystems":"*resources;*accounts", .."OriginID":"f1c3db6e9aea754291eed5cdc944cdd2@0:0:0:0:0:0:0:0;2fc2c199", .."RequestType":"*prepaid", .."Tenant":"cgrates.org", .."Account":"1001", .."Destination":"1003", .."AnswerTime":"1524570917", .."Usage":"12"}, ## T 2018/04/24 07:55:29.546664 127.0.0.1:8448 -> 127.0.0.1:36774 [AP] 285:{"event":"CGR_CALL_END", .."cgr_subsystems":"*resources;*accounts", .."OriginID":"f1c3db6e9aea754291eed5cdc944cdd2@0:0:0:0:0:0:0:0;2fc2c199", .."RequestType":"*prepaid", .."Tenant":"cgrates.org", .."Account":"1001", .."Destination":"1003", .."AnswerTime":"1524570917", .."Usage":"12"}, # ### Additional Information ``` kamailio -V version: kamailio 5.1.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.9.2 ``` * **Operating System**: ``` root@teo:/home/teo# cat /etc/debian_version 8.10 ``` Thank you in advance TeoV -- 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/1512

2 3

git:5.1:7fdace34: tls: condition on libressl version for declaring BIO data functions
by Daniel-Constantin Mierla 25 Apr '18

25 Apr '18

Module: kamailio Branch: 5.1 Commit: 7fdace3485a20de08ffc99a090987b81ac9a9e10 URL: https://github.com/kamailio/kamailio/commit/7fdace3485a20de08ffc99a090987b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T14:11:22+02:00 tls: condition on libressl version for declaring BIO data functions - it is required only for LIBRESSL_VERSION_NUMBER < 0x20700000L - fixes compilation on Alpine linux - part of GH #1511 (cherry picked from commit cffd8bd88f140487db8149184e15e08ff3d71f44) --- Modified: src/modules/tls/tls_bio.c --- Diff: https://github.com/kamailio/kamailio/commit/7fdace3485a20de08ffc99a090987b8… Patch: https://github.com/kamailio/kamailio/commit/7fdace3485a20de08ffc99a090987b8… --- diff --git a/src/modules/tls/tls_bio.c b/src/modules/tls/tls_bio.c index 567ed6f563..beb177399d 100644 --- a/src/modules/tls/tls_bio.c +++ b/src/modules/tls/tls_bio.c @@ -85,6 +85,8 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line) return ret; } # define OPENSSL_zalloc(num) CRYPTO_zalloc(num, __FILE__, __LINE__) + +#if LIBRESSL_VERSION_NUMBER < 0x20700000L static void *BIO_get_data(BIO *b) { return b->ptr; @@ -97,6 +99,8 @@ static void BIO_set_init(BIO *b, int init) { b->init = init; } +#endif + #else static BIO_METHOD *tls_mbuf_method = NULL; #endif

1 0

[kamailio/kamailio] Fixed build with LibreSSL 2.7 (ticket #1509) (#1511)
by sergey-safarov 25 Apr '18

25 Apr '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1511 -- Commit Summary -- * Fixed build with LibreSSL 2.7 (ticket #1509) -- File Changes -- M src/modules/tls/tls_bio.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1511.patch https://github.com/kamailio/kamailio/pull/1511.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/1511

2 2

git:master:cffd8bd8: tls: condition on libressl version for declaring BIO data functions
by Daniel-Constantin Mierla 25 Apr '18

25 Apr '18

Module: kamailio Branch: master Commit: cffd8bd88f140487db8149184e15e08ff3d71f44 URL: https://github.com/kamailio/kamailio/commit/cffd8bd88f140487db8149184e15e08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-25T14:08:00+02:00 tls: condition on libressl version for declaring BIO data functions - it is required only for LIBRESSL_VERSION_NUMBER < 0x20700000L - fixes compilation on Alpine linux - part of GH #1511 --- Modified: src/modules/tls/tls_bio.c --- Diff: https://github.com/kamailio/kamailio/commit/cffd8bd88f140487db8149184e15e08… Patch: https://github.com/kamailio/kamailio/commit/cffd8bd88f140487db8149184e15e08… --- diff --git a/src/modules/tls/tls_bio.c b/src/modules/tls/tls_bio.c index 567ed6f563..beb177399d 100644 --- a/src/modules/tls/tls_bio.c +++ b/src/modules/tls/tls_bio.c @@ -85,6 +85,8 @@ static void *CRYPTO_zalloc(size_t num, const char *file, int line) return ret; } # define OPENSSL_zalloc(num) CRYPTO_zalloc(num, __FILE__, __LINE__) + +#if LIBRESSL_VERSION_NUMBER < 0x20700000L static void *BIO_get_data(BIO *b) { return b->ptr; @@ -97,6 +99,8 @@ static void BIO_set_init(BIO *b, int init) { b->init = init; } +#endif + #else static BIO_METHOD *tls_mbuf_method = NULL; #endif

1 0

Kamailio v5.1.3 Released
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Hello, Kamailio SIP Server v5.1.3 stable release is out. This is a maintenance release of the latest stable branch, 5.1, that includes fixes since the release of v5.1.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.1.x. Deployments running previous v5.1.x versions are strongly recommended to be upgraded to v5.1.3. For more details about version 5.1.3 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2018/04/kamailio-v5-1-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 0

git:5.1:30b71758: ChangeLog: content prepared for v5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: 30b71758dbc21dc71f3fc2a501bd7097197da644 URL: https://github.com/kamailio/kamailio/commit/30b71758dbc21dc71f3fc2a501bd709… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T14:51:30+02:00 ChangeLog: content prepared for v5.1.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/30b71758dbc21dc71f3fc2a501bd709… Patch: https://github.com/kamailio/kamailio/commit/30b71758dbc21dc71f3fc2a501bd709… --- diff --git a/ChangeLog b/ChangeLog index 42fc85827b..77268bbe51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,18 @@ ===================== Changes Since Version 5.1.2 =========================== +commit 5f5f7fd506bbde1ac159cbebf133e499dc06427a (HEAD -> 5.1) +Author: lyokha <alexey.radkov(a)gmail.com> +Date: Tue Apr 24 14:46:32 2018 +0200 + + textops: reinitialize new tr_param_t object for tr_txt_parse_re() + + - avoid segfault when running fparam_free_restore() on + such an object immediately after creation, because its field "next" + contains garbage + + (cherry picked from commit 38b8fbdf940b273cf541678fd22af7dd4d63ab3d) + commit f300f27140ba7fc313850fb2d70a9fbfc3064801 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 24 12:41:48 2018 +0200

1 0

git:5.1:5f5f7fd5: textops: reinitialize new tr_param_t object for tr_txt_parse_re()
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: 5f5f7fd506bbde1ac159cbebf133e499dc06427a URL: https://github.com/kamailio/kamailio/commit/5f5f7fd506bbde1ac159cbebf133e49… Author: lyokha <alexey.radkov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T14:49:04+02:00 textops: reinitialize new tr_param_t object for tr_txt_parse_re() - avoid segfault when running fparam_free_restore() on such an object immediately after creation, because its field "next" contains garbage (cherry picked from commit 38b8fbdf940b273cf541678fd22af7dd4d63ab3d) --- Modified: src/modules/textops/txt_var.c --- Diff: https://github.com/kamailio/kamailio/commit/5f5f7fd506bbde1ac159cbebf133e49… Patch: https://github.com/kamailio/kamailio/commit/5f5f7fd506bbde1ac159cbebf133e49… --- diff --git a/src/modules/textops/txt_var.c b/src/modules/textops/txt_var.c index 398cd42120..6970b66bc7 100644 --- a/src/modules/textops/txt_var.c +++ b/src/modules/textops/txt_var.c @@ -215,6 +215,7 @@ char* tr_txt_parse_re(str *in, trans_t *t) LM_ERR("no more private memory!\n"); goto error; } + memset(tp, 0, sizeof(tr_param_t)); se=subst_parser(&tok);

1 0

[kamailio/kamailio] textops: properly initialize new tr_param_t object (#1506)
by Alexey Radkov 24 Apr '18

24 Apr '18

Just `memset()` this to `0`. Without this kamailio segfaults when running `fparam_free_restore()` on a variable that contains transformations immediately after creation, because field `next` of the transformation contains garbage. In my case this was variable which contained `re.subst` transformation. And below is the top of the backtrace. ``` #0 0x00000000005cba17 in tr_param_free (tp=0x292873257325203a) at core/pvapi.c:1804 #1 0x00000000005cb677 in tr_destroy (t=0x7f6387ed0c40) at core/pvapi.c:1742 #2 0x00000000005cb9c1 in tr_free (t=0x0) at core/pvapi.c:1786 #3 0x00000000005ca194 in pv_spec_destroy (spec=0x7f6387ed0b80) at core/pvapi.c:1570 #4 0x00000000005ca1b7 in pv_spec_free (spec=0x7f6387ed0b80) at core/pvapi.c:1578 #5 0x0000000000541820 in fparam_free_contents (fp=0x7f6387ed0ae0) at core/sr_module.c:1334 #6 0x0000000000541898 in fparam_free_restore (param=0x7f6387ed1168) at core/sr_module.c:1364 ```   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1506 -- Commit Summary -- * properly initialize new tr_param_t object -- File Changes -- M src/modules/textops/txt_var.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1506.patch https://github.com/kamailio/kamailio/pull/1506.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/1506

2 2

git:master:38b8fbdf: textops: reinitialize new tr_param_t object for tr_txt_parse_re()
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: master Commit: 38b8fbdf940b273cf541678fd22af7dd4d63ab3d URL: https://github.com/kamailio/kamailio/commit/38b8fbdf940b273cf541678fd22af7d… Author: lyokha <alexey.radkov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T14:46:32+02:00 textops: reinitialize new tr_param_t object for tr_txt_parse_re() - avoid segfault when running fparam_free_restore() on such an object immediately after creation, because its field "next" contains garbage --- Modified: src/modules/textops/txt_var.c --- Diff: https://github.com/kamailio/kamailio/commit/38b8fbdf940b273cf541678fd22af7d… Patch: https://github.com/kamailio/kamailio/commit/38b8fbdf940b273cf541678fd22af7d… --- diff --git a/src/modules/textops/txt_var.c b/src/modules/textops/txt_var.c index 398cd42120..6970b66bc7 100644 --- a/src/modules/textops/txt_var.c +++ b/src/modules/textops/txt_var.c @@ -215,6 +215,7 @@ char* tr_txt_parse_re(str *in, trans_t *t) LM_ERR("no more private memory!\n"); goto error; } + memset(tp, 0, sizeof(tr_param_t)); se=subst_parser(&tok);

1 0

git:5.1:6ffd296d: ChangeLog: content updated for v5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: 6ffd296de50a1936bd7b5883ab375e48b7ad086d URL: https://github.com/kamailio/kamailio/commit/6ffd296de50a1936bd7b5883ab375e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:59:47+02:00 ChangeLog: content updated for v5.1.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/6ffd296de50a1936bd7b5883ab375e4… Patch: https://github.com/kamailio/kamailio/commit/6ffd296de50a1936bd7b5883ab375e4…

1 0

git:5.1:f300f271: Makefile.defs: version set to 5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: f300f27140ba7fc313850fb2d70a9fbfc3064801 URL: https://github.com/kamailio/kamailio/commit/f300f27140ba7fc313850fb2d70a9fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:41:48+02:00 Makefile.defs: version set to 5.1.3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/f300f27140ba7fc313850fb2d70a9fb… Patch: https://github.com/kamailio/kamailio/commit/f300f27140ba7fc313850fb2d70a9fb… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index b7346a71fe..86b57216b8 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:5.1:e1fd2ed4: ims_charging: fixed check result code at mscc level (#1504)
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: e1fd2ed4bfdc2704f1c89f1b64d852599c0b6726 URL: https://github.com/kamailio/kamailio/commit/e1fd2ed4bfdc2704f1c89f1b64d8525… Author: yuri-r <yuri.rootshtein(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:40:26+02:00 ims_charging: fixed check result code at mscc level (#1504) * ims_charging: fixed check result code at mscc level according to RFC 4006 the Result-Code in Multiple-Services-Credit-Control AVP is optional. resume_on_initial_ccr() stops proceeding CCA if no Result-Code in MSCC and goes to error1 even though the Result-Code on CCR itself is 2001 (SUCCESSFUL) * ims_charging: fixed check result code at mscc level according to RFC 4006 the Result-Code in Multiple-Services-Credit-Control AVP is optional. resume_on_initial_ccr() stops proceeding CCA if no Result-Code in MSCC and goes to error1 even though the Result-Code on CCR itself is 2001 (SUCCESSFUL) (cherry picked from commit 352440d299f1b9f431cc05397f4ea6a7b5967c8a) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/e1fd2ed4bfdc2704f1c89f1b64d8525… Patch: https://github.com/kamailio/kamailio/commit/e1fd2ed4bfdc2704f1c89f1b64d8525… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 735f5b30be..497f65dd72 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1361,7 +1361,7 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, create_cca_fui_avps(fui_action, redirecturi); /* check result code at mscc level */ - if (ro_cca_data->mscc->resultcode != 2001) { + if (ro_cca_data->mscc->resultcode && ro_cca_data->mscc->resultcode != 2001) { LM_DBG("CCA failure at MSCC level with resultcode [%d]\n", ro_cca_data->mscc->resultcode); error_code = RO_RETURN_FALSE; goto error1;

1 0

git:master:352440d2: ims_charging: fixed check result code at mscc level (#1504)
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: master Commit: 352440d299f1b9f431cc05397f4ea6a7b5967c8a URL: https://github.com/kamailio/kamailio/commit/352440d299f1b9f431cc05397f4ea6a… Author: yuri-r <yuri.rootshtein(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:39:07+02:00 ims_charging: fixed check result code at mscc level (#1504) * ims_charging: fixed check result code at mscc level according to RFC 4006 the Result-Code in Multiple-Services-Credit-Control AVP is optional. resume_on_initial_ccr() stops proceeding CCA if no Result-Code in MSCC and goes to error1 even though the Result-Code on CCR itself is 2001 (SUCCESSFUL) * ims_charging: fixed check result code at mscc level according to RFC 4006 the Result-Code in Multiple-Services-Credit-Control AVP is optional. resume_on_initial_ccr() stops proceeding CCA if no Result-Code in MSCC and goes to error1 even though the Result-Code on CCR itself is 2001 (SUCCESSFUL) --- Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/352440d299f1b9f431cc05397f4ea6a… Patch: https://github.com/kamailio/kamailio/commit/352440d299f1b9f431cc05397f4ea6a… --- diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index 735f5b30be..497f65dd72 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -1361,7 +1361,7 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, create_cca_fui_avps(fui_action, redirecturi); /* check result code at mscc level */ - if (ro_cca_data->mscc->resultcode != 2001) { + if (ro_cca_data->mscc->resultcode && ro_cca_data->mscc->resultcode != 2001) { LM_DBG("CCA failure at MSCC level with resultcode [%d]\n", ro_cca_data->mscc->resultcode); error_code = RO_RETURN_FALSE; goto error1;

1 0

[kamailio/kamailio] ims_charging: fixed check result code at mscc level (#1504)
by yuri-r 24 Apr '18

24 Apr '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description according to RFC 4006 the Result-Code in Multiple-Services-Credit-Control AVP is optional. resume_on_initial_ccr() stops proceeding CCA if no Result-Code in MSCC and goes to error1 even though the Result-Code on CCR itself is 2001 (SUCCESSFUL) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1504 -- Commit Summary -- * ims_charging: fixed check result code at mscc level -- File Changes -- M src/modules/ims_charging/ims_ro.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1504.patch https://github.com/kamailio/kamailio/pull/1504.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/1504

2 2

git:5.1:db8fa7d5: pkg/alpine: version set to 5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: db8fa7d50cc420c0def4e56e1e1d85db33065cc8 URL: https://github.com/kamailio/kamailio/commit/db8fa7d50cc420c0def4e56e1e1d85d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:35:41+02:00 pkg/alpine: version set to 5.1.3 --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/db8fa7d50cc420c0def4e56e1e1d85d… Patch: https://github.com/kamailio/kamailio/commit/db8fa7d50cc420c0def4e56e1e1d85d… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 1e98751427..5ba6f7398e 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.1 +pkgver=5.1.3 pkgrel=0 # If building from a git snapshot, specify the gitcommit

1 0

git:5.1:314aa224: pkg/rpm: version set to 5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: 314aa22404647dc5619bc66f9f415a0bb405e14e URL: https://github.com/kamailio/kamailio/commit/314aa22404647dc5619bc66f9f415a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-24T12:36:20+02:00 pkg/rpm: version set to 5.1.3 --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/314aa22404647dc5619bc66f9f415a0… Patch: https://github.com/kamailio/kamailio/commit/314aa22404647dc5619bc66f9f415a0… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 4a3538f927..1a5f233217 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index c0e030af4c..d857e53cbf 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel dev6%{dist} %bcond_with dnssec diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index c6a8ce986f..b274092cd1 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 3f0ba2a401..333b4cc6ef 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0%{dist} %if 0%{?fedora} == 25 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 1f89b9e128..f578cd6723 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 6d9d1bc690..93b0c933b8 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index a6d52e9513..a2ac6bdf06 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index bff991171c..ad2e21fcae 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.2 +%define ver 5.1.3 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:5.1:39b73a0f: pkg/kamailio/deb: version 5.1.3
by Victor Seva 24 Apr '18

24 Apr '18

Module: kamailio Branch: 5.1 Commit: 39b73a0f765f189219e06eafc0e041da20ca0688 URL: https://github.com/kamailio/kamailio/commit/39b73a0f765f189219e06eafc0e041d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-04-24T10:35:55+02:00 pkg/kamailio/deb: version 5.1.3 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/39b73a0f765f189219e06eafc0e041d… Patch: https://github.com/kamailio/kamailio/commit/39b73a0f765f189219e06eafc0e041d… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 9c72d55ad4..b07aa09c42 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.3) unstable; urgency=medium + + * version set to 5.1.3 + + -- Victor Seva <vseva(a)debian.org> Tue, 24 Apr 2018 10:34:57 +0200 + kamailio (5.1.2) unstable; urgency=medium * version set to 5.1.2

1 0

Planning the release of Kamailio v5.1.3
by Daniel-Constantin Mierla 24 Apr '18

24 Apr '18

Hello, I am considering to package a new release from branch 5.1, respectively v5.1.3 sometime next week, likely on Tuesday or Wednesday (April 24 or 25). I any issue is not yet reported on github tracker, do it as soon as possible to have a chance to be investigated. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

2 3

git:master:ffa9bcc7: pv: new variable $mbu - updated msg buffer
by Daniel-Constantin Mierla 23 Apr '18

23 Apr '18

Module: kamailio Branch: master Commit: ffa9bcc79d0cafdfad47aac1ff3ffa09842ae22d URL: https://github.com/kamailio/kamailio/commit/ffa9bcc79d0cafdfad47aac1ff3ffa0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-23T09:22:23+02:00 pv: new variable $mbu - updated msg buffer - get the message buffer after applying changes - the original buffer stays unchanged --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/ffa9bcc79d0cafdfad47aac1ff3ffa0… Patch: https://github.com/kamailio/kamailio/commit/ffa9bcc79d0cafdfad47aac1ff3ffa0… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 1bc2af1e8e..d03a52409a 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -263,6 +263,9 @@ static pv_export_t mod_pvs[] = { {{"mb", (sizeof("mb")-1)}, /* */ PVT_OTHER, pv_get_msg_buf, 0, 0, 0, 0, 0}, + {{"mbu", (sizeof("mbu")-1)}, /* */ + PVT_OTHER, pv_get_msg_buf_updated, 0, + 0, 0, 0, 0}, {{"mf", (sizeof("mf")-1)}, /* */ PVT_OTHER, pv_get_flags, pv_set_mflags, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 098d5435c2..8d8f35f250 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -33,6 +33,7 @@ #include "../../core/tcp_conn.h" #include "../../core/pvapi.h" #include "../../core/trim.h" +#include "../../core/msg_translator.h" #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_uri.h" @@ -518,6 +519,45 @@ int pv_get_msg_buf(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &s); } + +static str _ksr_pv_msg_buf_updated = STR_NULL; +int pv_get_msg_buf_updated(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + dest_info_t send_info; + + if(msg==NULL) + return -1; + + if(_ksr_pv_msg_buf_updated.s!=NULL) { + pkg_free(_ksr_pv_msg_buf_updated.s); + _ksr_pv_msg_buf_updated.s = NULL; + _ksr_pv_msg_buf_updated.len = 0; + } + + init_dest_info(&send_info); + send_info.proto = PROTO_UDP; + if(msg->first_line.type == SIP_REPLY) { + _ksr_pv_msg_buf_updated.s = generate_res_buf_from_sip_res(msg, + (unsigned int*)&_ksr_pv_msg_buf_updated.len, + BUILD_NO_VIA1_UPDATE); + } else if(msg->first_line.type == SIP_REQUEST) { + _ksr_pv_msg_buf_updated.s = build_req_buf_from_sip_req(msg, + (unsigned int*)&_ksr_pv_msg_buf_updated.len, + &send_info, + BUILD_NO_PATH|BUILD_NO_LOCAL_VIA|BUILD_NO_VIA1_UPDATE); + } else { + return pv_get_null(msg, param, res); + } + + if(_ksr_pv_msg_buf_updated.s == NULL) { + LM_ERR("couldn't update msg buffer content\n"); + _ksr_pv_msg_buf_updated.len = 0; + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &_ksr_pv_msg_buf_updated); +} + int pv_get_msg_len(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 148e87f269..453c1c3197 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -94,6 +94,9 @@ int pv_get_cseq_body(struct sip_msg *msg, pv_param_t *param, int pv_get_msg_buf(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_msg_buf_updated(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_msg_len(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 22 Apr '18

22 Apr '18

- URL: https://github.com/kamailio/kamailio/commit/95db7165963d12ba8660bb947910146… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:21:26+02:00 dispatcher: exported more functions to kemi interface (cherry picked from commit 55ed25e1413c2fa5340138b7703c73db1df967de) - URL: https://github.com/kamailio/kamailio/commit/3e7d1a914769a96373cb2d003acb05f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:23:09+02:00 etc/kamailio.cfg: do not relay to foreign network if auth is not enabled - anyone can use a local account and flood external systems (cherry picked from commit 41f41d6d2850cdd5ab1a1b5d55bbb7ebd697ff7a) - URL: https://github.com/kamailio/kamailio/commit/a76ee50d96b7a713065c8e823ea8b4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:23:57+02:00 tm: removed inline for exported functions to config - they are assigned to a structure field, cannot be optimized for inline execution, avoid warnings in static analysis (cherry picked from commit 04d5a6a0ee8c230423b7bc7be0afe5d568fe8555) - URL: https://github.com/kamailio/kamailio/commit/fff68b42d62f9e5d1ef28f06a1f84e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:24:16+02:00 auth_diameter: updated application name (cherry picked from commit 7228a9e413f7d51411961b8ece7281ecf597a9e2) - URL: https://github.com/kamailio/kamailio/commit/d6aabb749d1be55ae2f2b4c65840242… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:24:32+02:00 cnxcc: updated application name in example (cherry picked from commit bb0940fd01a0188bc82d0608ac054fec5715ac56) - URL: https://github.com/kamailio/kamailio/commit/70dc29bffaa92d06edb84891f9e548b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:24:45+02:00 p_usrloc: updated path to db scripts in docs (cherry picked from commit a8827449e4c3c43e3f25abb7f5b27b2e1d1ab1b7) - URL: https://github.com/kamailio/kamailio/commit/e160730c2b6d2ec69ece0ac5d560d0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:24:59+02:00 rtpproxy: small updates to example cfg (cherry picked from commit 6162a74ad858c6a7421f461cd1483cc8d69c12c1) - URL: https://github.com/kamailio/kamailio/commit/87fb715ff3a0d687aefba01567f08e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:25:11+02:00 speeddial: updates to db url example (cherry picked from commit ea18525e27120943204a75470855a35fbc8cc46a) - URL: https://github.com/kamailio/kamailio/commit/c459054927fd0c805d7d090c3636600… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:25:22+02:00 uri_db: updated database name in docs (cherry picked from commit ae1367bf3a6706b9db742ff6e20e6d11f79d5b02) - URL: https://github.com/kamailio/kamailio/commit/760aee932aafc7f4c0207c10aabb5a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:25:58+02:00 core: check for result of dlopen() pointers (cherry picked from commit a3d9816d3881eb9743a14cb1306533469a821d47) - URL: https://github.com/kamailio/kamailio/commit/2a7fbdea7516896fb06b351caece3f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:26:51+02:00 phonenum: fixed lenght in pv name comparisons (cherry picked from commit 2196c677785fc4df4f4f1c03831eff679dcd5363) - URL: https://github.com/kamailio/kamailio/commit/1b571a66a48794e69593227f19d44f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:27:02+02:00 phonenum: build cctel from formatted number (cherry picked from commit 54c6a03704767a3dc15eb633ce1628e93c99a8ff) - URL: https://github.com/kamailio/kamailio/commit/4fb73546fd94f43e48de03025260639… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:27:16+02:00 phonenum: docs - updated pv names to match c code (cherry picked from commit 70a61e0bfa0640fbba8d6cfe57f6ad4c6a431b84) - URL: https://github.com/kamailio/kamailio/commit/19b23dac012b17d783f8db1f0b43a28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:28:19+02:00 rr: docs - added section ids (cherry picked from commit 7907cd15b5aacef8990e50dc19055a4e9b8e4359) - URL: https://github.com/kamailio/kamailio/commit/e4f1a229068e0cd774a32b4db4431aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:29:07+02:00 jsonrpcs: example accessing the jsonrpc response for jsonrpc_exec() (cherry picked from commit 0fcac52fc9e6445f986c9a5a9ee1b5230030035b) - URL: https://github.com/kamailio/kamailio/commit/7153e802288112658c6012488867596… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-22T08:30:36+02:00 ipops: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) (cherry picked from commit 3848b5286b74894ed162e1aae8c80ee3d703c21f) - URL: https://github.com/kamailio/kamailio/commit/4b9a95275c9f0b445f19b02ee60eec4… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-22T08:30:47+02:00 nat_traversal: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) (cherry picked from commit 32f1671bee21d5f8d52b5febf50ddc7b26f6919a) - URL: https://github.com/kamailio/kamailio/commit/742f4924eb515d6b481b8295fb611e7… Author: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-22T08:30:57+02:00 nathelper: Support for 192.0.0.0/29 as NATed source (pull request GH#1488) (cherry picked from commit 804d6b85bdbe55b32edacdbd895b0ad763bf619f) - URL: https://github.com/kamailio/kamailio/commit/9be00ceba0d814f6ad973279fc386d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:31:37+02:00 dialog: skip printing profiles and vars in terminated state for rpc dialog list - they can be delelted at that point, not being referenced by the same field (cherry picked from commit 8bc037bc87ced907b8b2e59a2c5fcb45291836fd) - URL: https://github.com/kamailio/kamailio/commit/0abe8f957e6c1242ab0962be8b66be9… Author: Guillaume Bour <guillaume.bour(a)diabolocom.com> Date: 2018-04-22T08:32:07+02:00 keepalive: cleanup rpc output (#1476) (cherry picked from commit b8a75c1c4fda079515606eb59273945842aff1be) - URL: https://github.com/kamailio/kamailio/commit/a0f8f33c5197b4fee5c2dedc85abbdb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:32:55+02:00 app_lua: test if number of parameters is enough for kemi funtions (cherry picked from commit cc661d776621a5f2d4370eb364402c2a53242cc7) - URL: https://github.com/kamailio/kamailio/commit/1fd326b2d4ff0480b24f993f66c376b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:33:08+02:00 dispatcher: fixed kemi exports param types (cherry picked from commit 1d1eeafc88979df41e2dcb6f2c8b41d16695fd7d) - URL: https://github.com/kamailio/kamailio/commit/43819d7d5acd4be0f2615e523c8f17a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:33:22+02:00 sqlops: proper function prototypes for kemi exports to get num rows and cols (cherry picked from commit 684f98ace6ec50d5c52b8f6e14fe184079a6206f) - URL: https://github.com/kamailio/kamailio/commit/300c0f4d026157728e9c0d5152a070b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:33:53+02:00 topos: skip local generated request not part of a dialog (cherry picked from commit 6d2312b8b0913f2f48e0f951c9578924e1d14f1d) - URL: https://github.com/kamailio/kamailio/commit/d7c1754c57443b81925ffb6e09a7e3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:34:19+02:00 ipops: mask subnet address when comparing - allow using full ip address when specifying subnet parameter - more flexibility on using values from sip message - GH #1250 (cherry picked from commit 1f675c68b3ed2b2e0a497fecd942c9213f0de058) - URL: https://github.com/kamailio/kamailio/commit/055bbcddbc072545f32698ebeeb15c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:34:32+02:00 ipops: use proper variable for ipv6 subnet comparison (cherry picked from commit 162c304d1264044ac1a46a379b75bafb4c91bcfd) - URL: https://github.com/kamailio/kamailio/commit/c9f6db1bfeb0381a76a30f1df38f538… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:34:43+02:00 ipops: mask subnet address for ipv6 comparison - coherent with ipv4 behaviour (cherry picked from commit a5dd60c8d7e04731f12108838a3c82149e04ef9c) - URL: https://github.com/kamailio/kamailio/commit/e4dc6ccbc9b9e63ea4300098952cd7b… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2018-04-22T08:36:31+02:00 rtpengine: Add description for metadata flag (cherry picked from commit 1e712ed93aef8ab96ee7a9760f89ebc0fd02caff) - URL: https://github.com/kamailio/kamailio/commit/1eea8119c3dc5478f1e8974bd7cccab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:37:08+02:00 dialog: added missing documentation for end_timeout parameter (cherry picked from commit 65df297db29192b2214a737208518db5cc7bff84) - URL: https://github.com/kamailio/kamailio/commit/f9e0bc365c60cada649fc3e6b7d9054… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:39:09+02:00 topos: reuse uuid for requests withing dialog - related to GH #1496 (cherry picked from commit 63e5a1f6d3f801136180bf2cb8a042d8af779f65) - URL: https://github.com/kamailio/kamailio/commit/0ca60d730a6c4a81706940190aa9da8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:39:32+02:00 nat_traversal: use the new function names for basic timer processes (cherry picked from commit 3d9dffd4b01fb1486d64824f971dbb1be112cdb6) - URL: https://github.com/kamailio/kamailio/commit/11ee34a0edca1eaf942fdf9825f1a75… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-04-22T08:39:55+02:00 ndb_mongodb: fix deprecation warning Since 1.5.0 mongoc_collection_find() is deprecated > http://mongoc.org/libmongoc/1.5.0/mongoc_collection_find.html (cherry picked from commit c70d831aee5a95613de69568d8f1863788e0a074) - URL: https://github.com/kamailio/kamailio/commit/7b35a9e194b51ec9b2b5a2a70bedce4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:40:08+02:00 lcr: docs - added many section ids (cherry picked from commit 681a104eeed6982d17b15701491bdff35662bf82) - URL: https://github.com/kamailio/kamailio/commit/ffa97a1b920df367e23f88cd6c6a4bd… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-04-22T08:40:26+02:00 dialog: restore keep-alive after restart (cherry picked from commit a821ff61029a4e8a9f220d60f95bd7b5a545f9b4) - URL: https://github.com/kamailio/kamailio/commit/b89f643e12ac6359b4ffd9c173fee48… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-04-22T08:40:49+02:00 dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value (cherry picked from commit ad427fc19c56110f66df86b7b49e23c00313610a) - URL: https://github.com/kamailio/kamailio/commit/5bbb6a41467575a1ccfdb3a103d1d8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:41:02+02:00 counters: docs - format section ids (cherry picked from commit 4bab8e5587f59132afb21e29c5a08e71df3c6f8b) - URL: https://github.com/kamailio/kamailio/commit/b422e257333b403e88ac16c714662fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T08:41:12+02:00 drouting: docs - added several section ids (cherry picked from commit c5764f003c8f425c881cda7dc73ee5eab0e71825)

1 0

git:master:5fb231b6: core: add extra via params from xavp
by Daniel-Constantin Mierla 22 Apr '18

22 Apr '18

Module: kamailio Branch: master Commit: 5fb231b69f150494a8d51e2581635e98520866ad URL: https://github.com/kamailio/kamailio/commit/5fb231b69f150494a8d51e2581635e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-21T21:16:04+02:00 core: add extra via params from xavp --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/5fb231b69f150494a8d51e2581635e9… Patch: https://github.com/kamailio/kamailio/commit/5fb231b69f150494a8d51e2581635e9… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 5d7c1866e5..22122768a1 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -103,6 +103,8 @@ #include "parser/parse_param.h" #include "forward.h" #include "str_list.h" +#include "pvapi.h" +#include "xavp.h" #include "rand/kam_rand.h" #define append_str_trans(_dest,_src,_len,_msg) \ @@ -2849,6 +2851,7 @@ char* create_via_hf( unsigned int *len, struct hostport hp; char sbuf[24]; int slen; + str xparams; #if defined USE_TCP || defined USE_SCTP char* id_buf; unsigned int id_len; @@ -2931,6 +2934,29 @@ char* create_via_hf( unsigned int *len, } } + /* test and add xavp params */ + if(msg && (msg->msg_flags&FL_ADD_XAVP_VIA) && _ksr_xavp_via_params.len>0) { + xparams.s = pv_get_buffer(); + xparams.len = xavp_serialize_fields(&_ksr_xavp_via_params, + xparams.s, pv_get_buffer_size()); + if(xparams.len>0) { + via = (char*)pkg_malloc(extra_params.len+xparams.len+1); + if(via==0) { + LM_ERR("building xavps params failed\n"); + if (extra_params.s) pkg_free(extra_params.s); + return 0; + } + if(extra_params.len != 0) { + memcpy(via, extra_params.s, extra_params.len); + pkg_free(extra_params.s); + } + memcpy(via + extra_params.len, xparams.s, xparams.len); + extra_params.s = via; + extra_params.len += xparams.len; + extra_params.s[extra_params.len] = '\0'; + } + } + set_hostport(&hp, msg); via = via_builder( len, send_info, branch, extra_params.len?&extra_params:0, &hp);

1 0

git:master:22f93ba6: pv: exported xavp_params_implode() to kemi
by Daniel-Constantin Mierla 22 Apr '18

22 Apr '18

Module: kamailio Branch: master Commit: 22f93ba67e4ee1f517c0e66138e2ba7c2d6db885 URL: https://github.com/kamailio/kamailio/commit/22f93ba67e4ee1f517c0e66138e2ba7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-22T07:58:36+02:00 pv: exported xavp_params_implode() to kemi --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/22f93ba67e4ee1f517c0e66138e2ba7… Patch: https://github.com/kamailio/kamailio/commit/22f93ba67e4ee1f517c0e66138e2ba7… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index bdb4e17834..1bc2af1e8e 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1119,6 +1119,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_params_implode"), + SR_KEMIP_INT, ki_xavp_params_implode, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("evalx"), SR_KEMIP_INT, ki_pv_evalx, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:af6c8088: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 20 Apr '18

20 Apr '18

Module: kamailio Branch: master Commit: af6c8088d5e07c8487bc6eda6c528deaa15df0a5 URL: https://github.com/kamailio/kamailio/commit/af6c8088d5e07c8487bc6eda6c528de… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-20T12:47:01+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/af6c8088d5e07c8487bc6eda6c528de… Patch: https://github.com/kamailio/kamailio/commit/af6c8088d5e07c8487bc6eda6c528de…

1 0

git:master:d19a68be: pv: new function - xavp_params_implode(xname, pv)
by Daniel-Constantin Mierla 20 Apr '18

20 Apr '18

Module: kamailio Branch: master Commit: d19a68be381fea741afe520340849cafd437d929 URL: https://github.com/kamailio/kamailio/commit/d19a68be381fea741afe520340849ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-20T12:28:39+02:00 pv: new function - xavp_params_implode(xname, pv) - serialize the subbfields of $xavp(xname) in params format (name=value;) and set the output to variable pv --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/d19a68be381fea741afe520340849ca… Patch: https://github.com/kamailio/kamailio/commit/d19a68be381fea741afe520340849ca… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 258be56399..bdb4e17834 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -24,6 +24,7 @@ #include "../../core/sr_module.h" #include "../../core/pvar.h" +#include "../../core/pvapi.h" #include "../../core/lvalue.h" #include "../../core/mod_fix.h" #include "../../core/xavp.h" @@ -528,6 +529,7 @@ static int is_int(struct sip_msg* msg, char* pvar, char* s2); static int pv_typeof(sip_msg_t *msg, char *pv, char *t); static int pv_not_empty(sip_msg_t *msg, char *pv, char *s2); static int w_xavp_params_explode(sip_msg_t *msg, char *pparams, char *pxname); +static int w_xavp_params_implode(sip_msg_t *msg, char *pxname, char *pvname); static int w_sbranch_set_ruri(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_append(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_reset(sip_msg_t *msg, char p1, char *p2); @@ -564,6 +566,9 @@ static cmd_export_t cmds[]={ {"xavp_params_explode", (cmd_function)w_xavp_params_explode, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, + {"xavp_params_implode", (cmd_function)w_xavp_params_implode, + 2, fixup_spve_str, fixup_free_spve_str, + ANY_ROUTE}, {"sbranch_set_ruri", (cmd_function)w_sbranch_set_ruri, 0, 0, 0, ANY_ROUTE }, {"sbranch_append", (cmd_function)w_sbranch_append, 0, 0, 0, @@ -816,6 +821,63 @@ static int ki_xavp_params_explode(sip_msg_t *msg, str *sparams, str *sxname) return 1; } +/** + * + */ +static int ki_xavp_params_implode(sip_msg_t *msg, str *sxname, str *svname) +{ + pv_spec_t *vspec=NULL; + pv_value_t val; + + if(sxname==NULL || sxname->s==NULL || sxname->len<=0) { + LM_ERR("invalid xavp name\n"); + return -1; + } + if(svname==NULL || svname->s==NULL || svname->len<=0) { + LM_ERR("invalid output var name\n"); + return -1; + } + + vspec = pv_cache_get(svname); + if(vspec==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", svname->len, svname->s); + return -1; + } + if(vspec->setf==NULL) { + LM_ERR("read only output variable [%.*s]\n", svname->len, svname->s); + return -1; + } + + val.rs.s = pv_get_buffer(); + val.rs.len = xavp_serialize_fields(sxname, val.rs.s, pv_get_buffer_size()); + if(val.rs.len<=0) { + return -1; + } + + val.flags = PV_VAL_STR; + if(vspec->setf(msg, &vspec->pvp, EQ_T, &val)<0) { + LM_ERR("setting PV failed [%.*s]\n", svname->len, svname->s); + return -1; + } + + return 1; +} + +/** + * + */ +static int w_xavp_params_implode(sip_msg_t *msg, char *pxname, char *pvname) +{ + str sxname; + + if(fixup_get_svalue(msg, (gparam_t*)pxname, &sxname)!=0) { + LM_ERR("cannot get the xavp name\n"); + return -1; + } + + return ki_xavp_params_implode(msg, &sxname, (str*)pvname); +} + /** * */

1 0

git:master:42c8595e: pv: docs for xavp_params_implode(...) function
by Daniel-Constantin Mierla 20 Apr '18

20 Apr '18

Module: kamailio Branch: master Commit: 42c8595e58e31806ecfc6201d47d7c5957e7522c URL: https://github.com/kamailio/kamailio/commit/42c8595e58e31806ecfc6201d47d7c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-20T12:38:17+02:00 pv: docs for xavp_params_implode(...) function --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/42c8595e58e31806ecfc6201d47d7c5… Patch: https://github.com/kamailio/kamailio/commit/42c8595e58e31806ecfc6201d47d7c5… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 61209f1898..f5faa0ab11 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -292,6 +292,37 @@ xavp_params_explode("a=b;c=d;e=d", "x"); # $xavp(x=>a) = "b"; # $xavp(x=>c) = "d"; # $xavp(x=>e) = "f"; +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_params_implode"> + <title> + <function moreinfo="none">xavp_params_implode(xname, pvname)</function> + </title> + <para> + Serialize the subfields in an XAVP to a parameters string format. + </para> + <para> + The first parameter has to be the name of XAVP (only the string + name, not the in $xavp(name)). The second parameter + is the name of output variable (in full name, like $var(output)). + </para> + <para> + The value is stored as string type. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_params_implode</function> usage</title> + <programlisting format="linespecific"> +... +$xavp(x=>e) = "f"; +$xavp(x[0]=>c) = "d"; +$xavp(x[0]=>a) = "b"; +xavp_params_implode("x", "$var(out)"); +# results in: $var(out) is "a=b;c=d;e=f;" ... </programlisting> </example>

1 0

git:master:887278c5: core: xavp - helper function to serialize subfields in a params list
by Daniel-Constantin Mierla 20 Apr '18

20 Apr '18

Module: kamailio Branch: master Commit: 887278c5254e35ac1a617e5fc68347829d0ac185 URL: https://github.com/kamailio/kamailio/commit/887278c5254e35ac1a617e5fc683478… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-20T11:58:20+02:00 core: xavp - helper function to serialize subfields in a params list --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/887278c5254e35ac1a617e5fc683478… Patch: https://github.com/kamailio/kamailio/commit/887278c5254e35ac1a617e5fc683478… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 27a200fbfb..c9529a02f6 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -843,4 +843,65 @@ sr_xavp_t* xavp_get_child_with_sval(str *rname, str *cname) return vavp; } + + +/** + * serialize the values in subfields of an xavp in name=value; format + * - rname - name of the root list xavp + * - obuf - buffer were to write the output + * - olen - the size of obuf + * return: 0 - not found; -1 - error; >0 - length of output + */ + +int xavp_serialize_fields(str *rname, char *obuf, int olen) +{ + sr_xavp_t *ravp = NULL; + sr_xavp_t *avp = NULL; + str ostr; + int rlen; + + ravp = xavp_get(rname, NULL); + if(ravp==NULL || ravp->val.type!=SR_XTYPE_XAVP) { + /* not found or not holding subfields */ + return 0; + } + + rlen = 0; + ostr.s = obuf; + avp = ravp->val.v.xavp; + while(avp) { + switch(avp->val.type) { + case SR_XTYPE_INT: + LM_DBG(" XAVP int value: %d\n", avp->val.v.i); + ostr.len = snprintf(ostr.s, olen-rlen, "%.*s=%u;", + avp->name.len, avp->name.s, (unsigned int)avp->val.v.i); + if(ostr.len<=0 || ostr.len>=olen-rlen) { + LM_ERR("failed to serialize int value (%d/%d\n", + ostr.len, olen-rlen); + return -1; + } + break; + case SR_XTYPE_STR: + LM_DBG(" XAVP str value: %s\n", avp->val.v.s.s); + ostr.len = snprintf(ostr.s, olen-rlen, "%.*s=%.*s;", + avp->name.len, avp->name.s, + avp->val.v.s.len, avp->val.v.s.s); + if(ostr.len<=0 || ostr.len>=olen-rlen) { + LM_ERR("failed to serialize int value (%d/%d\n", + ostr.len, olen-rlen); + return -1; + } + break; + default: + LM_DBG("skipping value type: %d\n", avp->val.type); + ostr.len = 0; + } + if(ostr.len>0) { + ostr.s += ostr.len; + rlen += ostr.len; + } + avp = avp->next; + } + return rlen; +} #endif diff --git a/src/core/xavp.h b/src/core/xavp.h index 42413e70b7..8014bc5694 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -101,6 +101,8 @@ sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold); sr_xavp_t* xavp_get_child(str *rname, str *cname); sr_xavp_t* xavp_get_child_with_ival(str *rname, str *cname); sr_xavp_t* xavp_get_child_with_sval(str *rname, str *cname); +int xavp_serialize_fields(str *rname, char *obuf, int olen); + #endif #endif

1 0

git:master:499455c2: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 19 Apr '18

19 Apr '18

Module: kamailio Branch: master Commit: 499455c260ff83fb670886245f1c436dcef5eee0 URL: https://github.com/kamailio/kamailio/commit/499455c260ff83fb670886245f1c436… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-19T19:02:14+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/499455c260ff83fb670886245f1c436… Patch: https://github.com/kamailio/kamailio/commit/499455c260ff83fb670886245f1c436… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 1e4d96fe9f..ce62fa950d 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -55,6 +55,7 @@ Muhammad Shahzad Shafi 4.15. set_recv_socket(saddr) 4.16. set_source_address(saddr) 4.17. via_add_srvid(flags) + 4.18. via_add_xavp_params(flags) 5. RPC Commands @@ -93,8 +94,9 @@ Muhammad Shahzad Shafi 1.18. set_recv_socket usage 1.19. set_source_address usage 1.20. via_add_srvid usage - 1.21. event_route[network:msg] use cases - 1.22. Sample PERL code for do_compress and do_uncompress + 1.21. via_add_xavp_params usage + 1.22. event_route[network:msg] use cases + 1.23. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -132,6 +134,7 @@ Chapter 1. Admin Guide 4.15. set_recv_socket(saddr) 4.16. set_source_address(saddr) 4.17. via_add_srvid(flags) + 4.18. via_add_xavp_params(flags) 5. RPC Commands @@ -268,6 +271,7 @@ modparam("corex", "msg_avp", "$avp(msg)") 4.15. set_recv_socket(saddr) 4.16. set_source_address(saddr) 4.17. via_add_srvid(flags) + 4.18. via_add_xavp_params(flags) 4.1. append_branch([ uri, [ q ] ]) @@ -525,6 +529,21 @@ set_source_address("udp:127.0.0.1:5080"); via_add_srv("1"); ... +4.18. via_add_xavp_params(flags) + + Control if fields of the xavp with the name specified by + xavp_via_params global parameter are added or not to local Via. + + Meaning of the parameters is as follows: + * flags: 1 - add xavp parameters; 0 - do not add xavp parameters. + + This function can be used from ANY_ROUTE. + + Example 1.21. via_add_xavp_params usage +... +via_add_xavp_params("1"); +... + 5. RPC Commands 5.1. corex.debug @@ -659,7 +678,7 @@ via_add_srv("1"); Next is a basic usage example where encoding and decoding is done using PERL, - Example 1.21. event_route[network:msg] use cases + Example 1.22. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -690,7 +709,7 @@ event_route[network:msg] { } ... - Example 1.22. Sample PERL code for do_compress and do_uncompress + Example 1.23. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

1 0

git:master:63f596e4: corex: docs for via_add_xavp_params() function
by Daniel-Constantin Mierla 19 Apr '18

19 Apr '18

Module: kamailio Branch: master Commit: 63f596e412c4800c191c17498edd06433ca9a949 URL: https://github.com/kamailio/kamailio/commit/63f596e412c4800c191c17498edd064… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-19T18:24:36+02:00 corex: docs for via_add_xavp_params() function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/63f596e412c4800c191c17498edd064… Patch: https://github.com/kamailio/kamailio/commit/63f596e412c4800c191c17498edd064… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index a8076b36c5..bada400b9f 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -603,7 +603,34 @@ via_add_srv("1"); </programlisting> </example> </section> + <section id="corex.f.via_add_xavp_params"> + <title><function moreinfo="none">via_add_xavp_params(flags)</function></title> + <para> + Control if fields of the xavp with the name specified by + xavp_via_params global parameter are added or not to local Via. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flags</emphasis>: 1 - add xavp parameters; 0 - do not + add xavp parameters. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>via_add_xavp_params</function> usage</title> + <programlisting format="linespecific"> +... +via_add_xavp_params("1"); +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:46551674: corex: new function via_add_xavp_params(flags)
by Daniel-Constantin Mierla 19 Apr '18

19 Apr '18

Module: kamailio Branch: master Commit: 465516744241d1f82850bfb8be8a9a97c26b65bf URL: https://github.com/kamailio/kamailio/commit/465516744241d1f82850bfb8be8a9a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-19T18:17:32+02:00 corex: new function via_add_xavp_params(flags) - control the flag for adding xavp fields to via params --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/465516744241d1f82850bfb8be8a9a9… Patch: https://github.com/kamailio/kamailio/commit/465516744241d1f82850bfb8be8a9a9… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 2eb4ff2863..0d7ce35857 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -55,6 +55,7 @@ static int w_set_send_socket(sip_msg_t *msg, char *psock, char *p2); static int w_set_recv_socket(sip_msg_t *msg, char *psock, char *p2); static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2); static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *p2); +static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2); static int fixup_file_op(void** param, int param_no); @@ -114,6 +115,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"via_add_srvid", (cmd_function)w_via_add_srvid, 1, fixup_igp_null, 0, ANY_ROUTE }, + {"via_add_xavp_params", (cmd_function)w_via_add_xavp_params, 1, fixup_igp_null, + 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -718,6 +721,34 @@ static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *s2) return ki_via_add_srvid(msg, fval); } +/** + * + */ +static int ki_via_add_xavp_params(sip_msg_t *msg, int fval) +{ + if(msg==NULL) + return -1; + if(fval) { + msg->msg_flags |= FL_ADD_XAVP_VIA; + } else { + msg->msg_flags &= ~(FL_ADD_XAVP_VIA); + } + return 1; +} + +/** + * + */ +static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_t*)pflags, &fval)!=0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_via_add_xavp_params(msg, fval); +} + /** * */ @@ -773,7 +804,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - + { str_init("corex"), str_init("via_add_xavp_params"), + SR_KEMIP_INT, ki_via_add_xavp_params, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */

1 0

git:master:b2e07731: core: added internal flag for adding xavp fields to via params
by Daniel-Constantin Mierla 19 Apr '18

19 Apr '18

Module: kamailio Branch: master Commit: b2e07731113d1ffb3072af86734b70ed2fa233a6 URL: https://github.com/kamailio/kamailio/commit/b2e07731113d1ffb3072af86734b70e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-19T18:16:59+02:00 core: added internal flag for adding xavp fields to via params --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/b2e07731113d1ffb3072af86734b70e… Patch: https://github.com/kamailio/kamailio/commit/b2e07731113d1ffb3072af86734b70e… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index b06ff0d8d2..9d9d73a36e 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -101,6 +101,7 @@ typedef enum request_method { #define FL_RR_ADDED (1<<18) /* Record-Route header was added */ #define FL_UAC_AUTH (1<<19) /* Proxy UAC-like authentication */ #define FL_ADD_SRVID (1<<20) /*!< add 'srvid' to local via hdr */ +#define FL_ADD_XAVP_VIA (1<<21) /*!< add xavp fields to local via params */ /* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

1 0

git:master:97f8c975: core: new core parameter xavp_via_params
by Daniel-Constantin Mierla 19 Apr '18

19 Apr '18

Module: kamailio Branch: master Commit: 97f8c975b006fed3ea817a62654d2957c8077d12 URL: https://github.com/kamailio/kamailio/commit/97f8c975b006fed3ea817a62654d295… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-19T17:50:48+02:00 core: new core parameter xavp_via_params - set the name of the xavp whose subfields will be added as via params --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/97f8c975b006fed3ea817a62654d295… Patch: https://github.com/kamailio/kamailio/commit/97f8c975b006fed3ea817a62654d295… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 67803e9b58..033f87e3df 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -293,6 +293,7 @@ LOGPREFIX log_prefix LOGPREFIXMODE log_prefix_mode LOGENGINETYPE log_engine_type LOGENGINEDATA log_engine_data +XAVPVIAPARAMS xavp_via_params LISTEN listen ADVERTISE advertise|ADVERTISE ALIAS alias @@ -694,6 +695,7 @@ IMPORTFILE "import_file" <INITIAL>{LOGPREFIXMODE} { yylval.strval=yytext; return LOGPREFIXMODE; } <INITIAL>{LOGENGINETYPE} { yylval.strval=yytext; return LOGENGINETYPE; } <INITIAL>{LOGENGINEDATA} { yylval.strval=yytext; return LOGENGINEDATA; } +<INITIAL>{XAVPVIAPARAMS} { yylval.strval=yytext; return XAVPVIAPARAMS; } <INITIAL>{LISTEN} { count(); yylval.strval=yytext; return LISTEN; } <INITIAL>{ADVERTISE} { count(); yylval.strval=yytext; return ADVERTISE; } <INITIAL>{ALIAS} { count(); yylval.strval=yytext; return ALIAS; } diff --git a/src/core/cfg.y b/src/core/cfg.y index ff94b604b2..25be814025 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -324,6 +324,7 @@ extern char *default_routename; %token LOGPREFIXMODE %token LOGENGINETYPE %token LOGENGINEDATA +%token XAVPVIAPARAMS %token LISTEN %token ADVERTISE %token ALIAS @@ -797,6 +798,10 @@ assign_stm: | LOGENGINETYPE EQUAL error { yyerror("string value expected"); } | LOGENGINEDATA EQUAL STRING { _km_log_engine_data=$3; } | LOGENGINEDATA EQUAL error { yyerror("string value expected"); } + | XAVPVIAPARAMS EQUAL STRING { _ksr_xavp_via_params.s=$3; + _ksr_xavp_via_params.len=strlen($3); + } + | XAVPVIAPARAMS EQUAL error { yyerror("string value expected"); } | DNS EQUAL NUMBER { received_dns|= ($3)?DO_DNS:0; } | DNS EQUAL error { yyerror("boolean value expected"); } | REV_DNS EQUAL NUMBER { received_dns|= ($3)?DO_REV_DNS:0; } diff --git a/src/core/globals.h b/src/core/globals.h index 786e8f2578..d335a99caf 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -205,6 +205,7 @@ extern int http_reply_parse; extern int _sr_ip_free_bind; extern int ksr_verbose_startup; extern int ksr_route_locks_size; +extern str _ksr_xavp_via_params; #ifdef USE_DNS_CACHE extern int dns_cache_init; /* if 0, the DNS cache is not initialized at startup */ diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 414648d6af..5d7c1866e5 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -111,7 +111,7 @@ extern char version[]; extern int version_len; - +str _ksr_xavp_via_params = STR_NULL; /** per process fixup function for global_req_flags. * It should be called from the configuration framework.

1 0

Info: Kamailio Unit Testing Framework using Docker
by Daniel-Constantin Mierla 19 Apr '18

19 Apr '18

Hello, a while ago, I started to put together a unit testing framework for Kamailio. It was more or less inspired from the old shell-based testing framework added by Henning Westerholt many years ago (which still resides in source tree path test/unit/), but now leveraging docker to have an isolated environment for running the tests. The new testing framework is available on github at: * https://github.com/kamailio/kamailio-tests Giacomo Vacca helped a bit so far, he is actually going to present more about it at Kamailio World 2018 (https://www.kamailioworld.com/k06/schedule/). But we want now to get more feedback from community, eventually to adjust the framework to become something easy to use and even more important, to be easy to contribute to. One of the main benefits from my point of view it would be to have the reports of the issues that can be reproduced submitted along with a unit test. It would make it easier to troubleshoot and then after fixing it, would be tested always before releases in order to avoid regressions. Right now, a good help from community would represent converting the old unit tests to the new framework, afterwards we can decommission test/unit. The conversion should be rather easy, as we still rely on shell and the sip tools like sipp/sipsak ... If you want to help here by you need clarifications or get stuck somewhere, just write to mailing list and I would be more than happy to assist. Such contributions should be submitted as pull requests in order to be easy to review: * https://github.com/kamailio/kamailio-tests/pulls Looking forward to your feedback, comments or contributions! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 0

git:master:9ae3eef9: modules: readme files regenerated - msilo ... [skip ci]
by Kamailio Dev 18 Apr '18

18 Apr '18

Module: kamailio Branch: master Commit: 9ae3eef958a48752836f392f8f23fbe775f98d81 URL: https://github.com/kamailio/kamailio/commit/9ae3eef958a48752836f392f8f23fbe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-18T09:01:33+02:00 modules: readme files regenerated - msilo ... [skip ci] --- Modified: src/modules/msilo/README --- Diff: https://github.com/kamailio/kamailio/commit/9ae3eef958a48752836f392f8f23fbe… Patch: https://github.com/kamailio/kamailio/commit/9ae3eef958a48752836f392f8f23fbe… --- diff --git a/src/modules/msilo/README b/src/modules/msilo/README index afc679b1ed..7a8e5a4ac6 100644 --- a/src/modules/msilo/README +++ b/src/modules/msilo/README @@ -775,12 +775,6 @@ n") modparam("msilo","content_type_hdr","Content-Type: text/plain\r\n") modparam("msilo","offline_message","*** User $rU is offline!") -# -- tm params -- - -modparam("tm", "fr_timer", 10 ) -modparam("tm", "fr_inv_timer", 15 ) -modparam("tm", "wt_timer", 10 ) - route{ if ( !mf_process_maxfwd_header("10") )

1 0

git:5.0:7b758319: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 18 Apr '18

18 Apr '18

Module: kamailio Branch: 5.0 Commit: 7b758319e8bb2437f25abbd2c4cd38b8ee3055a5 URL: https://github.com/kamailio/kamailio/commit/7b758319e8bb2437f25abbd2c4cd38b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-18T08:46:21+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/msilo/README --- Diff: https://github.com/kamailio/kamailio/commit/7b758319e8bb2437f25abbd2c4cd38b… Patch: https://github.com/kamailio/kamailio/commit/7b758319e8bb2437f25abbd2c4cd38b… --- diff --git a/src/modules/msilo/README b/src/modules/msilo/README index 5d4ff2146d..456e530853 100644 --- a/src/modules/msilo/README +++ b/src/modules/msilo/README @@ -775,12 +775,6 @@ n") modparam("msilo","content_type_hdr","Content-Type: text/plain\r\n") modparam("msilo","offline_message","*** User $rU is offline!") -# -- tm params -- - -modparam("tm", "fr_timer", 10 ) -modparam("tm", "fr_inv_timer", 15 ) -modparam("tm", "wt_timer", 10 ) - route{ if ( !mf_process_maxfwd_header("10") )

1 0

git:master:74ceb7f8: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 18 Apr '18

18 Apr '18

Module: kamailio Branch: master Commit: 74ceb7f8ff8161ae9238ea75dbf486dbdfdf79e4 URL: https://github.com/kamailio/kamailio/commit/74ceb7f8ff8161ae9238ea75dbf486d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-18T08:31:57+02:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/74ceb7f8ff8161ae9238ea75dbf486d… Patch: https://github.com/kamailio/kamailio/commit/74ceb7f8ff8161ae9238ea75dbf486d… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index 59164a28d1..d71e21b4c2 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -167,13 +167,14 @@ Chapter 1. Admin Guide 4.1. pretty_format (int) - Pretty format for JSON-RPC response document. + Pretty format for JSON-RPC response document if set to 1. To disable, + set to 0. - Default value is '0'. + Default value is '1' (on). Example 1.1. Set pretty_format parameter ... -modparam("jsonrpcs", "pretty_format", 1) +modparam("jsonrpcs", "pretty_format", 0) ... 4.2. transport (int)

1 0

git:master:389c409c: jsonrpcs: set pretty_format param to 1 by default
by Daniel-Constantin Mierla 18 Apr '18

18 Apr '18

Module: kamailio Branch: master Commit: 389c409cb51fd8cd8036aca081530720e61c42af URL: https://github.com/kamailio/kamailio/commit/389c409cb51fd8cd8036aca08153072… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-18T08:28:20+02:00 jsonrpcs: set pretty_format param to 1 by default - kamctl relies on it for some response processing --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/389c409cb51fd8cd8036aca08153072… Patch: https://github.com/kamailio/kamailio/commit/389c409cb51fd8cd8036aca08153072… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index 4b64db557e..d6d7d7c753 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -86,18 +86,19 @@ <section id="jsonrpcs.p.pretty_format"> <title><varname>pretty_format</varname> (int)</title> <para> - Pretty format for JSON-RPC response document. + Pretty format for JSON-RPC response document if set to 1. To + disable, set to 0. </para> <para> <emphasis> - Default value is '0'. + Default value is '1' (on). </emphasis> </para> <example> <title>Set <varname>pretty_format</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("jsonrpcs", "pretty_format", 1) +modparam("jsonrpcs", "pretty_format", 0) ... </programlisting> </example> diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 98d66cc5cb..7ef1e39d34 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -76,7 +76,7 @@ static str JSONRPC_CONTENT_TYPE_HTML = str_init("application/json"); /*!< 0 - all available; 1 - http; 2 - fifo; 4 - datagram */ static int jsonrpc_transport = 6; /* fifo + datagram */ -static int jsonrpc_pretty_format = 0; +static int jsonrpc_pretty_format = 1; static int jsonrpc_register_rpc(void);

1 0

git:master:c5764f00: drouting: docs - added several section ids
by Daniel-Constantin Mierla 17 Apr '18

17 Apr '18

Module: kamailio Branch: master Commit: c5764f003c8f425c881cda7dc73ee5eab0e71825 URL: https://github.com/kamailio/kamailio/commit/c5764f003c8f425c881cda7dc73ee5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-17T08:58:03+02:00 drouting: docs - added several section ids --- Modified: src/modules/drouting/doc/drouting_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c5764f003c8f425c881cda7dc73ee5e… Patch: https://github.com/kamailio/kamailio/commit/c5764f003c8f425c881cda7dc73ee5e…

1 0

git:master:4bab8e55: counters: docs - format section ids
by Daniel-Constantin Mierla 16 Apr '18

16 Apr '18

Module: kamailio Branch: master Commit: 4bab8e5587f59132afb21e29c5a08e71df3c6f8b URL: https://github.com/kamailio/kamailio/commit/4bab8e5587f59132afb21e29c5a08e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-16T19:30:33+02:00 counters: docs - format section ids --- Modified: src/modules/counters/doc/counters_functions.xml Modified: src/modules/counters/doc/counters_params.xml Modified: src/modules/counters/doc/counters_rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/4bab8e5587f59132afb21e29c5a08e7… Patch: https://github.com/kamailio/kamailio/commit/4bab8e5587f59132afb21e29c5a08e7… --- diff --git a/src/modules/counters/doc/counters_functions.xml b/src/modules/counters/doc/counters_functions.xml index 9e6eae57fe..9a8b458092 100644 --- a/src/modules/counters/doc/counters_functions.xml +++ b/src/modules/counters/doc/counters_functions.xml @@ -15,7 +15,7 @@ <title>Functions</title> - <section id="cnt_inc"> + <section id="counters.f.cnt_inc"> <title> <function>cnt_inc([group.]name)</function> </title> @@ -43,7 +43,7 @@ route { </example> </section> - <section id="cnt_add"> + <section id="counters.f.cnt_add"> <title> <function>cnt_add([group.]name, number)</function> </title> @@ -69,7 +69,7 @@ route { </example> </section> - <section id="cnt_reset"> + <section id="counters.f.cnt_reset"> <title> <function>cnt_reset([group.]name)</function> </title> diff --git a/src/modules/counters/doc/counters_params.xml b/src/modules/counters/doc/counters_params.xml index f23f9484c4..b31d508b34 100644 --- a/src/modules/counters/doc/counters_params.xml +++ b/src/modules/counters/doc/counters_params.xml @@ -12,7 +12,7 @@ </sectioninfo> <title>Parameters</title> - <section id="scrip_counter"> + <section id="counters.p.scrip_counter"> <title><varname>script_counter</varname></title> <para> Define a new counter that can be used from the script. @@ -40,7 +40,7 @@ modparam("counters", "script_counter", "test.x:another example") # test.x </example> </section> - <section id="scrip_cnt_grp_name"> + <section id="counters.p.scrip_cnt_grp_name"> <title><varname>script_cnt_grp_name</varname></title> <para> Group name that will be used for the counters defined diff --git a/src/modules/counters/doc/counters_rpc.xml b/src/modules/counters/doc/counters_rpc.xml index 6b8e237aeb..82d07e9ddf 100644 --- a/src/modules/counters/doc/counters_rpc.xml +++ b/src/modules/counters/doc/counters_rpc.xml @@ -12,7 +12,7 @@ </sectioninfo> <title>RPC Commands</title> - <section id="cnt.r.get"> + <section id="counters.rpc.cnt.get"> <title> <function>cnt.get</function></title> <para> Get the value of the counter identified by group.counter_name. @@ -28,7 +28,7 @@ </example> </section> - <section id="cnt.r.reset"> + <section id="counters.rpc.cnt.reset"> <title> <function>cnt.reset</function></title> <para> Resets the counter identified by group.counter_name. @@ -44,7 +44,7 @@ </example> </section> - <section id="cnt.r.list_groups"> + <section id="counters.rpc.cnt.list_groups"> <title> <function>cnt.list_groups</function></title> <para> Lists all the declared counter groups. @@ -60,14 +60,14 @@ </example> </section> - <section id="cnt.r.grps_list"> + <section id="counters.rpc.cnt.grps_list"> <title> <function>cnt.grps_list</function></title> <para> Alias to cnt.list_groups. </para> </section> - <section id="cnt.r.list_vars"> + <section id="counters.rpc.cnt.list_vars"> <title> <function>cnt.list_vars</function></title> <para> Lists all the names of all the counters belonging to the @@ -84,14 +84,14 @@ </example> </section> - <section id="cnt.r.var_list"> + <section id="counters.rpc.cnt.var_list"> <title> <function>cnt.var_list</function></title> <para> Alias to cnt.list_vars. </para> </section> - <section id="cnt.r.get_vars"> + <section id="counters.rpc.cnt.get_vars"> <title> <function>cnt.get_vars</function></title> <para> Lists all the counter names and their values in the @@ -108,14 +108,14 @@ </example> </section> - <section id="cnt.r.grp_get_all"> + <section id="counters.rpc.cnt.grp_get_all"> <title> <function>cnt.grp_get_all</function></title> <para> Alias to cnt.get_vars. </para> </section> - <section id="cnt.r.help"> + <section id="counters.rpc.cnt.help"> <title> <function>cnt.help</function></title> <para> Displays the counter description.

1 0

[kamailio/kamailio] dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value (#1502)
by Dmitri Savolainen 16 Apr '18

16 Apr '18

#### 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 typo fix for DLG_IFLAG_DMQ_SYNC flag value You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1502 -- Commit Summary -- * dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value -- File Changes -- M src/modules/dialog/dlg_hash.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1502.patch https://github.com/kamailio/kamailio/pull/1502.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/1502

2 2

[kamailio/kamailio] dialog: restore keep-alive after restart (#1501)
by Dmitri Savolainen 16 Apr '18

16 Apr '18

#### 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 I've noticed kamailio stop send OPTIONS ("ka-dst"/"ka-src" params) after restart. This should fix You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1501 -- Commit Summary -- * dialog: restore keep-alive after restart -- File Changes -- M src/modules/dialog/dlg_db_handler.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1501.patch https://github.com/kamailio/kamailio/pull/1501.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/1501

2 2

git:master:0dc59586: Merge pull request #1502 from snen/dialog_fix_dmq_flag_value
by GitHub 16 Apr '18

16 Apr '18

Module: kamailio Branch: master Commit: 0dc595862baa62535efc7519330514aa30b552b1 URL: https://github.com/kamailio/kamailio/commit/0dc595862baa62535efc7519330514a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-04-16T19:19:22+02:00 Merge pull request #1502 from snen/dialog_fix_dmq_flag_value dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value --- Modified: src/modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/0dc595862baa62535efc7519330514a… Patch: https://github.com/kamailio/kamailio/commit/0dc595862baa62535efc7519330514a… --- diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index 91eb129d67..85fdc6cb83 100644 --- a/src/modules/dialog/dlg_hash.h +++ b/src/modules/dialog/dlg_hash.h @@ -78,7 +78,7 @@ #define DLG_IFLAG_TIMER_NORESET (1<<3) /*!< don't reset dialog timers on in-dialog messages reception */ #define DLG_IFLAG_CSEQ_DIFF (1<<4) /*!< CSeq changed in dialog */ #define DLG_IFLAG_PRACK (1<<5) /*!< PRACK was routed during initial state */ -#define DLG_IFLAG_DMQ_SYNC (1<<5) /*!< sync this dialog via dmq DMQ*/ +#define DLG_IFLAG_DMQ_SYNC (1<<6) /*!< sync this dialog via dmq DMQ*/ #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */ #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */

1 0

git:master:ad427fc1: dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value
by Dmitri Savolainen 16 Apr '18

16 Apr '18

Module: kamailio Branch: master Commit: ad427fc19c56110f66df86b7b49e23c00313610a URL: https://github.com/kamailio/kamailio/commit/ad427fc19c56110f66df86b7b49e23c… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-04-16T19:43:50+03:00 dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value --- Modified: src/modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/ad427fc19c56110f66df86b7b49e23c… Patch: https://github.com/kamailio/kamailio/commit/ad427fc19c56110f66df86b7b49e23c… --- diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index 91eb129d67..85fdc6cb83 100644 --- a/src/modules/dialog/dlg_hash.h +++ b/src/modules/dialog/dlg_hash.h @@ -78,7 +78,7 @@ #define DLG_IFLAG_TIMER_NORESET (1<<3) /*!< don't reset dialog timers on in-dialog messages reception */ #define DLG_IFLAG_CSEQ_DIFF (1<<4) /*!< CSeq changed in dialog */ #define DLG_IFLAG_PRACK (1<<5) /*!< PRACK was routed during initial state */ -#define DLG_IFLAG_DMQ_SYNC (1<<5) /*!< sync this dialog via dmq DMQ*/ +#define DLG_IFLAG_DMQ_SYNC (1<<6) /*!< sync this dialog via dmq DMQ*/ #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */ #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */

1 0

git:master:a821ff61: dialog: restore keep-alive after restart
by Dmitri Savolainen 16 Apr '18

16 Apr '18

Module: kamailio Branch: master Commit: a821ff61029a4e8a9f220d60f95bd7b5a545f9b4 URL: https://github.com/kamailio/kamailio/commit/a821ff61029a4e8a9f220d60f95bd7b… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-04-16T19:32:05+03:00 dialog: restore keep-alive after restart --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/a821ff61029a4e8a9f220d60f95bd7b… Patch: https://github.com/kamailio/kamailio/commit/a821ff61029a4e8a9f220d60f95bd7b… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 2a3e4301ad..eb1d97d7b7 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -464,6 +464,8 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, srjson_DestroyDoc(&jdoc); } dlg->iflags = (unsigned int)VAL_INT(values+22); + if (dlg->state==DLG_STATE_CONFIRMED) + dlg_ka_add(dlg); if (!dlg->bind_addr[DLG_CALLER_LEG] || !dlg->bind_addr[DLG_CALLEE_LEG]) { /* non-local socket, probably not our dialog */

1 0

git:master:2fcfc666: Merge pull request #1501 from snen/fix_dialog_options_restart
by GitHub 16 Apr '18

16 Apr '18

Module: kamailio Branch: master Commit: 2fcfc6666621cd8108de251eb5cfba48f365d2c6 URL: https://github.com/kamailio/kamailio/commit/2fcfc6666621cd8108de251eb5cfba4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-04-16T19:18:48+02:00 Merge pull request #1501 from snen/fix_dialog_options_restart dialog: restore keep-alive after restart --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/2fcfc6666621cd8108de251eb5cfba4… Patch: https://github.com/kamailio/kamailio/commit/2fcfc6666621cd8108de251eb5cfba4… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 2a3e4301ad..eb1d97d7b7 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -464,6 +464,8 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, srjson_DestroyDoc(&jdoc); } dlg->iflags = (unsigned int)VAL_INT(values+22); + if (dlg->state==DLG_STATE_CONFIRMED) + dlg_ka_add(dlg); if (!dlg->bind_addr[DLG_CALLER_LEG] || !dlg->bind_addr[DLG_CALLEE_LEG]) { /* non-local socket, probably not our dialog */

1 0

git:master:1d4f63c1: modules: readme files regenerated - app_lua ... [skip ci]
by Kamailio Dev 15 Apr '18

15 Apr '18

Module: kamailio Branch: master Commit: 1d4f63c147e99dfce0a9ef4ace6089c16f3fb35f URL: https://github.com/kamailio/kamailio/commit/1d4f63c147e99dfce0a9ef4ace6089c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-15T13:16:56+02:00 modules: readme files regenerated - app_lua ... [skip ci] --- Modified: src/modules/app_lua/README --- Diff: https://github.com/kamailio/kamailio/commit/1d4f63c147e99dfce0a9ef4ace6089c… Patch: https://github.com/kamailio/kamailio/commit/1d4f63c147e99dfce0a9ef4ace6089c… --- diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README index c8bba9fdf0..cac548c162 100644 --- a/src/modules/app_lua/README +++ b/src/modules/app_lua/README @@ -199,13 +199,14 @@ modparam("app_lua", "register", "sl") 3.3. reload (boolean) If reload is 1 enables the ability to reload the scripts using the RPC - app_lua.reload command. + app_lua.reload command. To disable reload feature, set this parameter + to 0. - Default value is “0 (off)”. + Default value is “1 (on)”. Example 1.4. Set reload parameter ... -modparam("app_lua", "reload", 1) +modparam("app_lua", "reload", 0) ... 4. Functions

1 0

git:master:40b7fa59: app_lua: defaut value for reload parameter set to 1
by Daniel-Constantin Mierla 15 Apr '18

15 Apr '18

Module: kamailio Branch: master Commit: 40b7fa59c739275f1e8a3d35c71f5251695af6e9 URL: https://github.com/kamailio/kamailio/commit/40b7fa59c739275f1e8a3d35c71f525… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-15T13:03:14+02:00 app_lua: defaut value for reload parameter set to 1 - reload feature enabbled by default, set to 0 to disable --- Modified: src/modules/app_lua/app_lua_api.c Modified: src/modules/app_lua/doc/app_lua_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40b7fa59c739275f1e8a3d35c71f525… Patch: https://github.com/kamailio/kamailio/commit/40b7fa59c739275f1e8a3d35c71f525… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 575ee4454b..7f0fd1fbc0 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -44,7 +44,7 @@ * reload enabled param * default: 0 (off) */ -static unsigned int _app_lua_sr_reload = 0; +static unsigned int _app_lua_sr_reload = 1; /** * */ diff --git a/src/modules/app_lua/doc/app_lua_admin.xml b/src/modules/app_lua/doc/app_lua_admin.xml index 915fe97745..45ed3e29c1 100644 --- a/src/modules/app_lua/doc/app_lua_admin.xml +++ b/src/modules/app_lua/doc/app_lua_admin.xml @@ -271,18 +271,19 @@ modparam("app_lua", "register", "sl") <title><varname>reload</varname> (boolean)</title> <para> If reload is 1 enables the ability to reload the - scripts using the RPC app_lua.reload command. + scripts using the RPC app_lua.reload command. To disable reload + feature, set this parameter to 0. </para> <para> <emphasis> - Default value is <quote>0 (off)</quote>. + Default value is <quote>1 (on)</quote>. </emphasis> </para> <example> <title>Set <varname>reload</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("app_lua", "reload", 1) +modparam("app_lua", "reload", 0) ... </programlisting> </example>

1 0

git:master:681a104e: lcr: docs - added many section ids
by Daniel-Constantin Mierla 14 Apr '18

14 Apr '18

Module: kamailio Branch: master Commit: 681a104eeed6982d17b15701491bdff35662bf82 URL: https://github.com/kamailio/kamailio/commit/681a104eeed6982d17b15701491bdff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-14T18:35:20+02:00 lcr: docs - added many section ids --- Modified: src/modules/lcr/doc/lcr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/681a104eeed6982d17b15701491bdff… Patch: https://github.com/kamailio/kamailio/commit/681a104eeed6982d17b15701491bdff…

1 0

[kamailio/kamailio] ndb_mongodb: fix deprecation warning (#1499)
by Victor Seva 14 Apr '18

14 Apr '18

Since 1.5.0 mongoc_collection_find() is deprecated > http://mongoc.org/libmongoc/1.5.0/mongoc_collection_find.html https://travis-ci.org/kamailio/kamailio/jobs/365964042 (dev-sid) > CC (clang) [M ndb_mongodb.so] mongodb_client.o > mongodb_client.c:290:18: warning: 'mongoc_collection_find' is deprecated [-Wdeprecated-declarations] > rpl->cursor = mongoc_collection_find (rpl->collection, > ^ > /usr/include/libmongoc-1.0/mongoc-collection.h:155:1: note: 'mongoc_collection_find' has been explicitly marked deprecated here > mongoc_collection_find (mongoc_collection_t *collection, > ^ > 1 warning generated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1499 -- Commit Summary -- * ndb_mongodb: fix deprecation warning -- File Changes -- M src/modules/ndb_mongodb/mongodb_client.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1499.patch https://github.com/kamailio/kamailio/pull/1499.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/1499

2 2

git:master:c70d831a: ndb_mongodb: fix deprecation warning
by Victor Seva 14 Apr '18

14 Apr '18

Module: kamailio Branch: master Commit: c70d831aee5a95613de69568d8f1863788e0a074 URL: https://github.com/kamailio/kamailio/commit/c70d831aee5a95613de69568d8f1863… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-04-14T17:29:25+02:00 ndb_mongodb: fix deprecation warning Since 1.5.0 mongoc_collection_find() is deprecated > http://mongoc.org/libmongoc/1.5.0/mongoc_collection_find.html --- Modified: src/modules/ndb_mongodb/mongodb_client.c --- Diff: https://github.com/kamailio/kamailio/commit/c70d831aee5a95613de69568d8f1863… Patch: https://github.com/kamailio/kamailio/commit/c70d831aee5a95613de69568d8f1863… --- diff --git a/src/modules/ndb_mongodb/mongodb_client.c b/src/modules/ndb_mongodb/mongodb_client.c index e74b8314f2..746c5876fd 100644 --- a/src/modules/ndb_mongodb/mongodb_client.c +++ b/src/modules/ndb_mongodb/mongodb_client.c @@ -216,9 +216,13 @@ int mongodbc_exec_cmd(str *srv, str *dname, str *cname, str *cmd, str *res, int bson_error_t error; bson_t command; bson_t reply; +#if MONGOC_CHECK_VERSION(1, 5, 0) + bson_t *opts; +#else + int nres; +#endif const bson_t *cdoc; char c; - int nres; int ret; if(srv==NULL || cmd==NULL || res==NULL) @@ -285,6 +289,20 @@ int mongodbc_exec_cmd(str *srv, str *dname, str *cname, str *cmd, str *res, int NULL, 0); } else { +#if MONGOC_CHECK_VERSION(1, 5, 0) + if(emode==3) opts = BCON_NEW("limit", BCON_INT32 (1)); + else opts = BCON_NEW("limit", BCON_INT32 (0)); + if(opts==NULL) { + LM_ERR("cannot initialize opts bson document\n"); + bson_destroy (&command); + goto error_exec; + } + rpl->cursor = mongoc_collection_find_with_opts (rpl->collection, + &command, + opts, + NULL); + bson_destroy (opts); +#else nres = 0; if(emode==3) nres = 1; /* return one result */ rpl->cursor = mongoc_collection_find (rpl->collection, @@ -295,6 +313,7 @@ int mongodbc_exec_cmd(str *srv, str *dname, str *cname, str *cmd, str *res, int &command, NULL, NULL); +#endif } bson_destroy (&command); if(rpl->cursor==NULL) {

1 0

[kamailio/kamailio] Feature Request: possibility to reload dialogs from db without restarting kamailio (#1274)
by alexsosic 14 Apr '18

14 Apr '18

Hi, we're trying to have scalable Kamailio nodes that are stateless. That means that we can for example load dispatchers and reload them from an API endpoint. Now we're stuck on the dialog part. All our nodes load the dialogs from a shared db, what happens when a node gets down is that a packet reaches another node and does not know how to handle that because the dialog does not have it's ip address. Also there is no possibility to reload the dialogs from db so that we could update the records in the db and have the dialogs ip changed on an anctive node's ip. Is there a possibility to have a function to reload the dialogs from db on a running kamailio? -- 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/1274

8 28

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev