sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
382 discussions

[kamailio/kamailio] Modules: db_redisusrloc for usrloc module (#1446)
by Surendra Tiwari 06 Nov '19

06 Nov '19

#### 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/1446 -- Commit Summary -- * kamailio db_redisusrloc -- File Changes -- A src/modules/db_redisusrloc/Makefile (36) A src/modules/db_redisusrloc/README (88) A src/modules/db_redisusrloc/db_redisusrloc.c (100) A src/modules/db_redisusrloc/doc/Makefile (4) A src/modules/db_redisusrloc/doc/db_redisusrloc.xml (45) A src/modules/db_redisusrloc/doc/db_redisusrloc_admin.xml (86) A src/modules/db_redisusrloc/redisdb_base.c (1189) A src/modules/db_redisusrloc/redisdb_connection.c (100) A src/modules/db_redisusrloc/redisdb_connection.h (43) A src/modules/db_redisusrloc/redisdb_dbase.h (96) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1446.patch https://github.com/kamailio/kamailio/pull/1446.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/1446

4 15

git:master:574b080d: core: slow timer - warning message if callback function is null
by Daniel-Constantin Mierla 05 Nov '19

05 Nov '19

Module: kamailio Branch: master Commit: 574b080d69b2b968cfe871bc7cfe8fdf930fbc2e URL: https://github.com/kamailio/kamailio/commit/574b080d69b2b968cfe871bc7cfe8fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-05T13:47:53+01:00 core: slow timer - warning message if callback function is null --- Modified: src/core/timer.c --- Diff: https://github.com/kamailio/kamailio/commit/574b080d69b2b968cfe871bc7cfe8fd… Patch: https://github.com/kamailio/kamailio/commit/574b080d69b2b968cfe871bc7cfe8fd… --- diff --git a/src/core/timer.c b/src/core/timer.c index 1bcd036fda..f6b60ec3df 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -1101,7 +1101,19 @@ void slow_timer_main() #endif SET_RUNNING_SLOW(tl); UNLOCK_SLOW_TIMER_LIST(); - ret=tl->f(*ticks, tl, tl->data); + if(likely(tl->f)) { + ret=tl->f(*ticks, tl, tl->data); + } else { + ret =0; +#ifdef TIMER_DEBUG + LM_WARN("null timer callback for %p (%s:%u - %s(...))\n", + tl, (tl->add_file)?tl->add_file:"unknown", + tl->add_line, + (tl->add_func)?tl->add_func:"unknown"); +#else + LM_WARN("null callback function for %p\n", tl); +#endif + } /* reset the configuration group handles */ cfg_reset_all(); if (ret==0){

1 0

git:master:867294f7: modules: readme files regenerated - presence_xml ... [skip ci]
by Kamailio Dev 05 Nov '19

05 Nov '19

Module: kamailio Branch: master Commit: 867294f79f30b1b737d78e623514b4b14475f9cf URL: https://github.com/kamailio/kamailio/commit/867294f79f30b1b737d78e623514b4b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-11-05T12:31:21+01:00 modules: readme files regenerated - presence_xml ... [skip ci] --- Modified: src/modules/presence_xml/README --- Diff: https://github.com/kamailio/kamailio/commit/867294f79f30b1b737d78e623514b4b… Patch: https://github.com/kamailio/kamailio/commit/867294f79f30b1b737d78e623514b4b… --- diff --git a/src/modules/presence_xml/README b/src/modules/presence_xml/README index 2098395373..9f7a80ba05 100644 --- a/src/modules/presence_xml/README +++ b/src/modules/presence_xml/README @@ -34,6 +34,9 @@ Anca-Maria Vamanu 3.9. passive_mode(int) 3.10. xcapauth_userdel_reason(str) 3.11. force_dummy_presence(int) + 3.12. force_presence_single_body(int) + 3.13. presence_single_body_priorities(str) + 3.14. presence_single_body_lookup_element(str) 4. Functions @@ -57,8 +60,11 @@ Anca-Maria Vamanu 1.9. Set passive_mode parameter 1.10. Set xcapauth_userdel_reason parameter 1.11. Set force_dummy_presence parameter - 1.12. pres_check_basic usage - 1.13. pres_check_activities usage + 1.12. Set force_presence_single_body parameter + 1.13. Set presence_single_body_priorities parameter + 1.14. Set presence_single_body_lookup_element parameter + 1.15. pres_check_basic usage + 1.16. pres_check_activities usage Chapter 1. Admin Guide @@ -83,6 +89,9 @@ Chapter 1. Admin Guide 3.9. passive_mode(int) 3.10. xcapauth_userdel_reason(str) 3.11. force_dummy_presence(int) + 3.12. force_presence_single_body(int) + 3.13. presence_single_body_priorities(str) + 3.14. presence_single_body_lookup_element(str) 4. Functions @@ -141,6 +150,9 @@ Chapter 1. Admin Guide 3.9. passive_mode(int) 3.10. xcapauth_userdel_reason(str) 3.11. force_dummy_presence(int) + 3.12. force_presence_single_body(int) + 3.13. presence_single_body_priorities(str) + 3.14. presence_single_body_lookup_element(str) 3.1. db_url(str) @@ -298,6 +310,50 @@ modparam("presence_xml", "xcapauth_userdel_reason", "rejected") modparam("presence_xml", "force_dummy_presence", 1) ... +3.12. force_presence_single_body(int) + + Set this parameter to enable single body notify. One presentity can + have multiple dialogs and will by default notify all the dialogs and + this can be a problem when dealing with large ring-groups or + attendants, use this parameter to only send one body. Look at + presence_single_body_priorities and presence_single_body_lookup_element + to customize the behaviour. + + Default value: “0”. + + Example 1.12. Set force_presence_single_body parameter +... +modparam("presence_xml", "force_presence_single_body", 1) +... + +3.13. presence_single_body_priorities(str) + + Change this parameter to set the priorities when choosing the dialog + that will be the final. + + Importance is left to right. + + Default value: “Available|Ringing|On the Phone”. + + Example 1.13. Set presence_single_body_priorities parameter +... +modparam("presence_xml", "presence_single_body_priorities", "Offline|Online|Busy +|Really Busy") +... + +3.14. presence_single_body_lookup_element(str) + + Set the name of the element that should be used to get the priority. If + the value obtained is not in the list of + presence_single_body_priorities the priority is 0. + + Default value: “note”. + + Example 1.14. Set presence_single_body_lookup_element parameter +... +modparam("presence_xml", "presence_single_body_lookup_element", "status") +... + 4. Functions 4.1. pres_check_basic(presentity_uri, status) @@ -314,7 +370,7 @@ modparam("presence_xml", "force_dummy_presence", 1) * 1 - if a match is found. * -1 - if a match is not found. - Example 1.12. pres_check_basic usage + Example 1.15. pres_check_basic usage ... if (pres_check_basic("$ru", "open")) { ... @@ -338,7 +394,7 @@ modparam("presence_xml", "force_dummy_presence", 1) * -1 - if a match is not found. * -2 - if /presence/person or /presence/person/activity do not exist. - Example 1.13. pres_check_activities usage + Example 1.16. pres_check_activities usage ... if (pres_check_basic("$ru", "open")) { pres_check_activities("$ru", "unknown");

1 0

git:master:9d32561b: presence_xml: adds option to aggregate xml body with priorities
by lazedo 05 Nov '19

05 Nov '19

Module: kamailio Branch: master Commit: 9d32561b15a12bd1ed2465a4ae1b4312662eb6fc URL: https://github.com/kamailio/kamailio/commit/9d32561b15a12bd1ed2465a4ae1b431… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2019-11-05T11:18:03Z presence_xml: adds option to aggregate xml body with priorities --- Modified: src/modules/presence_xml/doc/presence_xml_admin.xml Modified: src/modules/presence_xml/notify_body.c Modified: src/modules/presence_xml/presence_xml.c --- Diff: https://github.com/kamailio/kamailio/commit/9d32561b15a12bd1ed2465a4ae1b431… Patch: https://github.com/kamailio/kamailio/commit/9d32561b15a12bd1ed2465a4ae1b431…

1 0

[kamailio/kamailio] presence_xml: adds option to aggregate xml body with priorities (#2118)
by lazedo 05 Nov '19

05 Nov '19

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] 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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  this allow notify body aggregation with priorities You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2118 -- Commit Summary -- * presence_xml: adds option to aggregate xml body with priorities -- File Changes -- M src/modules/presence_xml/notify_body.c (112) M src/modules/presence_xml/presence_xml.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2118.patch https://github.com/kamailio/kamailio/pull/2118.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/2118

3 3

git:master:e6b70812: Makefile.groups: added kafka group
by Daniel-Constantin Mierla 04 Nov '19

04 Nov '19

Module: kamailio Branch: master Commit: e6b7081279ce16fc82a8ded4e785cae0dc0d3877 URL: https://github.com/kamailio/kamailio/commit/e6b7081279ce16fc82a8ded4e785cae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-04T19:41:55+01:00 Makefile.groups: added kafka group --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/e6b7081279ce16fc82a8ded4e785cae… Patch: https://github.com/kamailio/kamailio/commit/e6b7081279ce16fc82a8ded4e785cae… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 22fa6db0ed..cfc10227ec 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -207,6 +207,9 @@ mod_list_rabbitmq=rabbitmq # - modules depending on libphonenumber library mod_list_phonenum=phonenum +# - modules depending on rdkafka library +mod_list_kafka=kafka + # - modules depending on oRTP and mediastreamer2 libraries mod_list_rtp_media_server=rtp_media_server @@ -243,6 +246,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_http_async) $(mod_list_nsq) \ $(mod_list_rabbitmq) $(mod_list_jsdt)) \ $(mod_list_phonenum) \ + $(mod_list_kafka) \ $(mod_list_rtp_media_server) @@ -457,6 +461,9 @@ module_group_krabbitmq=$(mod_list_rabbitmq) # K phonenumber modules module_group_kphonenum=$(mod_list_phonenum) +# K kafka modules +module_group_kkafka=$(mod_list_kafka) + # K rtp_media_server modules module_group_krtp_media_server=$(mod_list_rtp_media_server)

1 0

git:master:da163fbe: Merge pull request #2112 from kamailio/vhernando/kafka_module_branch2
by GitHub 04 Nov '19

04 Nov '19

Module: kamailio Branch: master Commit: da163fbe65ac6ffd2b31933d3d58c07c13167e2a URL: https://github.com/kamailio/kamailio/commit/da163fbe65ac6ffd2b31933d3d58c07… Author: vhernando <bizenton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-11-04T18:01:36+01:00 Merge pull request #2112 from kamailio/vhernando/kafka_module_branch2 kafka: module to produce and send messages to a Kafka server --- Added: src/modules/kafka/Makefile Added: src/modules/kafka/doc/Makefile Added: src/modules/kafka/doc/kafka.xml Added: src/modules/kafka/doc/kafka_admin.xml Added: src/modules/kafka/kafka_mod.c Added: src/modules/kafka/kfk.c Added: src/modules/kafka/kfk.h --- Diff: https://github.com/kamailio/kamailio/commit/da163fbe65ac6ffd2b31933d3d58c07… Patch: https://github.com/kamailio/kamailio/commit/da163fbe65ac6ffd2b31933d3d58c07…

1 0

git:master:4ae09ec3: kafka: comment about suitable versions of librdkafka library
by Vicente Hernando 04 Nov '19

04 Nov '19

Module: kamailio Branch: master Commit: 4ae09ec3b1348df7c93c4a0e0f25e65acb223b49 URL: https://github.com/kamailio/kamailio/commit/4ae09ec3b1348df7c93c4a0e0f25e65… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-11-01T00:59:16+01:00 kafka: comment about suitable versions of librdkafka library --- Modified: src/modules/kafka/doc/kafka_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ae09ec3b1348df7c93c4a0e0f25e65… Patch: https://github.com/kamailio/kamailio/commit/4ae09ec3b1348df7c93c4a0e0f25e65… --- diff --git a/src/modules/kafka/doc/kafka_admin.xml b/src/modules/kafka/doc/kafka_admin.xml index 8483ad673f..09c0eaf8c6 100644 --- a/src/modules/kafka/doc/kafka_admin.xml +++ b/src/modules/kafka/doc/kafka_admin.xml @@ -47,6 +47,13 @@ url='https://github.com/edenhill/librdkafka'> https://github.com/edenhill/librdkafka</ulink> </para> + <para> + Old librdkafka version like 1.1.0 has been reported to work. + Newer versions should work fine (E.g: Version 1.2.2-RC1 also works OK) + <ulink + url='https://github.com/edenhill/librdkafka/releases'> + https://github.com/edenhill/librdkafka/releases</ulink> + </para> </listitem> </itemizedlist> </para>

1 0

git:master:fa9228b4: kafka: comment about error return code for kafka_send function
by Vicente Hernando 04 Nov '19

04 Nov '19

Module: kamailio Branch: master Commit: fa9228b45b29e29b807d03e267d2cb328b882b3d URL: https://github.com/kamailio/kamailio/commit/fa9228b45b29e29b807d03e267d2cb3… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-10-31T01:33:19+01:00 kafka: comment about error return code for kafka_send function --- Modified: src/modules/kafka/doc/kafka_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fa9228b45b29e29b807d03e267d2cb3… Patch: https://github.com/kamailio/kamailio/commit/fa9228b45b29e29b807d03e267d2cb3… --- diff --git a/src/modules/kafka/doc/kafka_admin.xml b/src/modules/kafka/doc/kafka_admin.xml index fe1ce430dc..8483ad673f 100644 --- a/src/modules/kafka/doc/kafka_admin.xml +++ b/src/modules/kafka/doc/kafka_admin.xml @@ -157,6 +157,9 @@ modparam("kafka", "topic", "name=third_topic") <para> Send a message to a specific topic via Kafka server. </para> + <para> + This function returns -1 for all sort of errors. (So execution of script continues) + </para> <para> Parameters: <itemizedlist>

1 0

git:master:95dd5245: kafka: get log levels from syslog.h header
by Vicente Hernando 04 Nov '19

04 Nov '19

Module: kamailio Branch: master Commit: 95dd5245ce2499f97ade9cf3f24b2ee52690880c URL: https://github.com/kamailio/kamailio/commit/95dd5245ce2499f97ade9cf3f24b2ee… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-10-31T00:00:24+01:00 kafka: get log levels from syslog.h header --- Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/95dd5245ce2499f97ade9cf3f24b2ee… Patch: https://github.com/kamailio/kamailio/commit/95dd5245ce2499f97ade9cf3f24b2ee… --- diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index 8cf48b7b41..859a4657b7 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -27,6 +27,7 @@ * - Module: \ref kfk */ +#include <syslog.h> /* For log levels. */ #include <librdkafka/rdkafka.h> #include "../../core/dprint.h" @@ -107,20 +108,6 @@ static rd_kafka_topic_t* kfk_topic_get(str *topic_name); static int kfk_stats_add(const char *topic, rd_kafka_resp_err_t err); static void kfk_stats_topic_free(kfk_stats_t *st_topic); -/** - * \name Logging_macros from /usr/include/sys/syslog.h - */ -/*@{*/ -#define LOG_EMERG 0 /* system is unusable */ -#define LOG_ALERT 1 /* action must be taken immediately */ -#define LOG_CRIT 2 /* critical conditions */ -#define LOG_ERR 3 /* error conditions */ -#define LOG_WARNING 4 /* warning conditions */ -#define LOG_NOTICE 5 /* normal but significant condition */ -#define LOG_INFO 6 /* informational */ -#define LOG_DEBUG 7 /* debug-level messages */ -/*@}*/ - /** * \brief Kafka logger callback */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019