sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
380 discussions

git:master:867294f7: modules: readme files regenerated - presence_xml ... [skip ci]

by Kamailio Dev

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");

4 years, 5 months

git:master:9d32561b: presence_xml: adds option to aggregate xml body with priorities

by lazedo

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…

4 years, 5 months

[kamailio/kamailio] presence_xml: adds option to aggregate xml body with priorities (#2118)

by lazedo

4 years, 5 months

git:master:e6b70812: Makefile.groups: added kafka group

by Daniel-Constantin Mierla

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)

4 years, 5 months

git:master:da163fbe: Merge pull request #2112 from kamailio/vhernando/kafka_module_branch2

by GitHub

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…

4 years, 5 months

git:master:4ae09ec3: kafka: comment about suitable versions of librdkafka library

by Vicente Hernando

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>

4 years, 5 months

git:master:fa9228b4: kafka: comment about error return code for kafka_send function

by Vicente Hernando

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>

4 years, 5 months

git:master:95dd5245: kafka: get log levels from syslog.h header

by Vicente Hernando

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 */

4 years, 5 months

git:master:3052e563: kafka: delete optional word in kfk_logger function

by Vicente Hernando

Module: kamailio Branch: master Commit: 3052e563d80dd96de880bc68eed8f06bf6f6e753 URL: https://github.com/kamailio/kamailio/commit/3052e563d80dd96de880bc68eed8f06… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-10-30T23:11:29+01:00 kafka: delete optional word in kfk_logger function --- Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/3052e563d80dd96de880bc68eed8f06… Patch: https://github.com/kamailio/kamailio/commit/3052e563d80dd96de880bc68eed8f06… --- diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index b33dde7df5..8cf48b7b41 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -122,13 +122,11 @@ static void kfk_stats_topic_free(kfk_stats_t *st_topic); /*@}*/ /** - * \brief Kafka logger callback (optional) + * \brief Kafka logger callback */ static void kfk_logger (const rd_kafka_t *rk, int level, const char *fac, const char *buf) { - /* LM_DBG("log_level: %d\n", level); */ - switch(level) { case LOG_EMERG: LM_NPRL("RDKAFKA fac: %s : %s : %s\n",

4 years, 5 months

[kamailio/kamailio] kafka: module to produce and send messages to a Kafka server (#2112)

by vhernando

#### 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  Module to produce and send messages to a Kafka server busing librdkafka library. I copy part of README file here: Chapter 1. Admin Guide Table of Contents 1. Overview 2. Dependencies 2.1. Kamailio Modules 2.2. External Libraries or Applications 2.3. Parameters 2.3.1. brokers (string) 2.3.2. configuration (string) 2.3.3. topic (string) 2.4. Functions 2.4.1. kafka_send(topic, msg) 2.5. RPC Commands 2.5.1. kafka.stats 2.5.2. kafka.stats_topic 1. Overview This module produces and sends messages to a Kafka server. 2. Dependencies 2.1. Kamailio Modules 2.2. External Libraries or Applications 2.3. Parameters 2.3.1. brokers (string) 2.3.2. configuration (string) 2.3.3. topic (string) 2.4. Functions 2.4.1. kafka_send(topic, msg) 2.5. RPC Commands 2.5.1. kafka.stats 2.5.2. kafka.stats_topic 2.1. Kamailio Modules The following modules must be loaded before this module: * none. 2.2. External Libraries or Applications The following libraries or applications must be installed before running Kamailio with this module loaded: * librdkafka: the Apache Kafka C/C++ client library. https://github.com/edenhill/librdkafka 2.3. Parameters 2.3.1. brokers (string) Specifies a list of brokers separated by commas. From librdkafka documentation: brokerlist is a ,-separated list of brokers in the format: <broker1>,<broker2>, Where each broker is in either the host or URL based format: * <host>[:<port>] * <proto>://<host>[:port] <proto> is either PLAINTEXT, SSL, SASL, SASL_PLAINTEXT The two formats can be mixed but ultimately the value of the security.protocol config property decides what brokers are allowed. This parameter is mandatory. There is no default value. Example 1.1. Set brokers parameter ... modparam("kafka", "brokers", "localhost:9092") modparam("kafka", "brokers", "broker1:10000,broker2") modparam("kafka", "brokers", "SSL://broker3:9000,ssl://broker2") ... 2.3.2. configuration (string) Specifies a set of general properties. Each configuration property follows: name = value pattern. And configuration properties are separated by ; This parameter is optional, but if it exists it can be configured only once. Example 1.2. Set configuration parameter ... modparam("kafka", "configuration", "topic.metadata.refresh.interval.ms=20000;que ue.buffering.max.messages=1000000;metadata.request.timeout.ms=90000") modparam("kafka", "configuration", "topic.metadata.refresh.interval.ms=20000;que ue.buffering.max.messages=500000;debug=all;metadata.request.timeout.ms=900000") ... 2.3.3. topic (string) Specifies a topic name and a set of topic properties. The topic defined in topic parameter has to already exist in Kafka servers. Each topic property is a list of attribute = value separated by semicolon. name atribute indicates the topic name. It is mandatory. Other attributes mean names of properties and are optional. This parameter is optional. Each topic needs a topic parameter so several topic parameters are allowed. Example 1.3. Set topic parameter ... modparam("kafka", "topic", "name=my_topic;request.required.acks=0;request.timeou t.ms=10000") modparam("kafka", "topic", "name=second_topic;request.required.acks=0;request.ti meout.ms=10000") modparam("kafka", "topic", "name=third_topic") ... 2.4. Functions 2.4.1. kafka_send(topic, msg) Send a message to a specific topic via Kafka server. Parameters: * topic: (string) name of the topic. It is mandatory. * msg: (string) message to send. It is mandatory. Available via KEMI framework as kafka.send. Example 1.4. kafka_send usage ... # Send "test message" to topic "my_topic" kafka_send("my_topic", "test message"); ... 2.5. RPC Commands 2.5.1. kafka.stats Show statistics about total sent messages and failed to deliver ones. Example 1.5. kafka.stats usage ... kamcmd kafka.stats Total messages: 26 Errors: 0 ... 2.5.2. kafka.stats_topic Show statistics about sent messages and failed to deliver ones for a specific topic. Parameter: topic (string) name of the topic. Required. Example 1.6. kafka.stats usage ... # Show statistics for my_topic. kamcmd kafka.stats_topic "my_topic" Topic: my_topic Total messages: 17 Errors: 0 ... You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2112 -- Commit Summary -- * kafka: module to produce and send messages to a Kafka server -- File Changes -- A src/modules/kafka/Makefile (23) A src/modules/kafka/doc/Makefile (4) A src/modules/kafka/doc/kafka.xml (41) A src/modules/kafka/doc/kafka_admin.xml (221) A src/modules/kafka/kafka_mod.c (335) A src/modules/kafka/kfk.c (1175) A src/modules/kafka/kfk.h (96) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2112.patch https://github.com/kamailio/kamailio/pull/2112.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/2112

4 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019