sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
381 discussions

git:master:c0aa4397: http_async_client: use core string handling instead of redundant implementation
by Henning Westerholt 23 Nov '19

23 Nov '19

Module: kamailio Branch: master Commit: c0aa4397d3c3158800d4a6af941c06b49dc21d8f URL: https://github.com/kamailio/kamailio/commit/c0aa4397d3c3158800d4a6af941c06b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-23T22:55:44+01:00 http_async_client: use core string handling instead of redundant implementation --- Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/c0aa4397d3c3158800d4a6af941c06b… Patch: https://github.com/kamailio/kamailio/commit/c0aa4397d3c3158800d4a6af941c06b… --- diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 948171b519..b5c2e8d637 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -352,16 +352,9 @@ static void *curl_shm_calloc(size_t nmemb, size_t size) static char *curl_shm_strdup(const char *cp) { - char *rval; - int len; + char *p = shm_char_dup(cp); - len = strlen(cp) + 1; - rval = shm_malloc(len); - if (!rval) - return NULL; - - memcpy(rval, cp, len); - return rval; + return p; } void set_curl_mem_callbacks(void)

1 0

git:master:c2886552: core: add two new string handling functions to copy chars and str
by Henning Westerholt 23 Nov '19

23 Nov '19

Module: kamailio Branch: master Commit: c288655278036e5125010ba3b818d2e9ddf5d1a4 URL: https://github.com/kamailio/kamailio/commit/c288655278036e5125010ba3b818d2e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-23T22:52:13+01:00 core: add two new string handling functions to copy chars and str - add two new string handling functions to copy chars and str - shm_str2char_dup: Make a copy from str structure to a char pointer using shm_malloc - shm_char_dup: Make a copy of a char pointer to a char pointer using shm_malloc --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/c288655278036e5125010ba3b818d2e… Patch: https://github.com/kamailio/kamailio/commit/c288655278036e5125010ba3b818d2e… --- diff --git a/src/core/ut.h b/src/core/ut.h index 2259aea973..8b64070947 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -691,7 +691,7 @@ static inline int str2sint(str* _s, int* _r) /** - * \brief Make a copy of a str structure using shm_malloc + * \brief Make a copy of a str structure to a str using shm_malloc * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -736,6 +736,58 @@ static inline int shm_str_dup(str* dst, const str* src) return 0; } +/** + * \brief Make a copy of a char pointer to a char pointer using shm_malloc + * \param src source + * \return a pointer to the new allocated char on success, 0 on failure + */ +static inline char* shm_char_dup(const char *src) +{ + char *rval; + int len; + + if (!src) { + LM_ERR("NULL src or dst\n"); + return NULL; + } + + len = strlen(src) + 1; + rval = shm_malloc(len); + if (!rval) { + SHM_MEM_ERROR; + return NULL; + } + + memcpy(rval, src, len); + + return rval; +} + + +/** + * \brief Make a copy from str structure to a char pointer using shm_malloc + * \param src source + * \return a pointer to the new allocated char on success, 0 on failure + */ +static inline char* shm_str2char_dup(str *src) +{ + char *res; + + if (!src || !src->s) { + LM_ERR("NULL src\n"); + return NULL; + } + + if (!(res = (char *) shm_malloc(src->len + 1))) { + SHM_MEM_ERROR; + return NULL; + } + + strncpy(res, src->s, src->len); + res[src->len] = 0; + + return res; +} /**

1 0

git:master:daa86b20: db_redis: declare variables at the beginning of the function
by Daniel-Constantin Mierla 23 Nov '19

23 Nov '19

Module: kamailio Branch: master Commit: daa86b204d3030e2abb2f2459aa348998b982ae2 URL: https://github.com/kamailio/kamailio/commit/daa86b204d3030e2abb2f2459aa3489… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-23T11:10:40+01:00 db_redis: declare variables at the beginning of the function - compiling with gcc 4.9 on debian jessie gives: error: 'for' loop initial declarations are only allowed in C99 or C11 mode --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/daa86b204d3030e2abb2f2459aa3489… Patch: https://github.com/kamailio/kamailio/commit/daa86b204d3030e2abb2f2459aa3489… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index 919cde71c3..50d1a62b10 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -923,6 +923,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name, char *match = NULL; int ret; redisReply *reply = NULL; + int i, j; *query_keys = NULL; *query_keys_count = 0; @@ -992,7 +993,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name, memcpy(match, ts_scan_key->s, scan_offset); // append a number of ?. minimum string length is 10 digits - for (int i = 0; i < scan_length - 1; i++) { + for (i = 0; i < scan_length - 1; i++) { int len = scan_offset + i; char match_char = ts_scan_key->s[len]; // skip non-numbers @@ -1020,7 +1021,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name, } } - for (int i = 0; i < scan_length; i++) { + for (i = 0; i < scan_length; i++) { int len = scan_offset + i; char match_char = ts_scan_key->s[len]; // skip non-numbers @@ -1042,7 +1043,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name, else len += sprintf(match + len, "[%c-9]", match_char + 1); // finish with trailing ?s - for (int j = i + 1; j < scan_length; j++) { + for (j = i + 1; j < scan_length; j++) { match_char = ts_scan_key->s[scan_offset + j]; // skip non-numbers if (match_char < '0' || match_char > '9') { @@ -1108,7 +1109,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name, LM_DBG("adding %i keys returned from set", (int) reply->elements); - for (int i = 0; i < reply->elements; i++) { + for (i = 0; i < reply->elements; i++) { if (reply->element[i]->type != REDIS_REPLY_STRING) { LM_ERR("Unexpected entry key type in type query, expecting a string\n"); goto out;

1 0

git:master:8ad2c3ab: kafka: declare variables at the beginning of the function
by Daniel-Constantin Mierla 23 Nov '19

23 Nov '19

Module: kamailio Branch: master Commit: 8ad2c3ab8af597e7567ed5ab04a5e3a16d74ad5d URL: https://github.com/kamailio/kamailio/commit/8ad2c3ab8af597e7567ed5ab04a5e3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-23T11:05:59+01:00 kafka: declare variables at the beginning of the function - compiling with gcc 4.9 on debian jessie gives: error: 'for' loop initial declarations are only allowed in C99 or C11 mode --- Modified: src/modules/kafka/kfk.c --- Diff: https://github.com/kamailio/kamailio/commit/8ad2c3ab8af597e7567ed5ab04a5e3a… Patch: https://github.com/kamailio/kamailio/commit/8ad2c3ab8af597e7567ed5ab04a5e3a… --- diff --git a/src/modules/kafka/kfk.c b/src/modules/kafka/kfk.c index 859a4657b7..7f1dd8c87c 100644 --- a/src/modules/kafka/kfk.c +++ b/src/modules/kafka/kfk.c @@ -732,6 +732,8 @@ static int kfk_topic_exist(str *topic_name) { /* Where to receive metadata. */ const struct rd_kafka_metadata *metadatap = NULL; + int i; + int topic_found = 0; /* Topic not found by default. */ if (!topic_name || topic_name->len == 0 || topic_name->s == NULL) { LM_ERR("Bad topic name\n"); @@ -747,9 +749,7 @@ static int kfk_topic_exist(str *topic_name) } /* List topics */ - int topic_found = 0; /* Topic not found by default. */ - - for (int i=0; i<metadatap->topic_cnt; i++) { + for (i=0; i<metadatap->topic_cnt; i++) { rd_kafka_metadata_topic_t *t = &metadatap->topics[i]; if (t->topic) { LM_DBG("Metadata Topic: %s\n", t->topic);

1 0

[kamailio/kamailio] etc/kamailio.cfg: loaded systemdops.so by default (#2144)
by sergey-safarov 23 Nov '19

23 Nov '19

#1762 ## 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 - [x] Related to issue #2139 #### Description Enabled systemd notification by default. Victor@linuxmaniac, is change acceptable for dist not have `systemd`? For similar RPM dist i goes to delete this sting during packaging rules execution. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2144 -- Commit Summary -- * etc/kamailio.cfg: loaded systemdops.so by default -- File Changes -- M etc/kamailio.cfg (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2144.patch https://github.com/kamailio/kamailio/pull/2144.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/2144

4 4

[kamailio/kamailio] support sd_notify() to improve systemd integration (#2139)
by Victor Seva 22 Nov '19

22 Nov '19

https://www.freedesktop.org/software/systemd/man/sd_notify.html > sd_notify() may be called by a service to notify the service manager about state changes. It can be used to send arbitrary information, encoded in an environment-block-like string. Most importantly, it can be used for start-up completion notification. -- 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/2139

4 18

git:master:febdb877: rtpengine: document play_dtmf() command
by Richard Fuchs 22 Nov '19

22 Nov '19

Module: kamailio Branch: master Commit: febdb8778f5ef338864f52e441a4311c0b2c04da URL: https://github.com/kamailio/kamailio/commit/febdb8778f5ef338864f52e441a4311… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-11-22T09:37:28-05:00 rtpengine: document play_dtmf() command --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/febdb8778f5ef338864f52e441a4311… Patch: https://github.com/kamailio/kamailio/commit/febdb8778f5ef338864f52e441a4311… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 9866f15fe0..9b358e1573 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2888,6 +2888,45 @@ stop_media("from-tag=5yqaeriguhxcikxj"); </example> </section> + <section id="rtpengine.f.play_dtmf"> + <title> + <function moreinfo="none">play_dtmf([flags])</function> + </title> + <para> + Injects a DTMF event into the media stream. Depending on which codecs were + negotiated, this either injects an RFC 2833/4733 DTMF event, or an in-band PCM + DTMF tone into the audio stream. The flag <quote>inject DTMF</quote> must have + been present in both offer and answer messages when the call was established, + which forces all audio to go through rtpengine's transcoding engine. + </para> + <para> + Usage is similar to <quote>play_media</quote> with the following exceptions. + The selected party is not the party that will receive the DTMF event, but rather + the party which is generating the event. This is to support DTMF + events that are carried in &sip; INFO messages. Instead of specifying a media file, + a DTMF event code must be specified, as well as optionally a duration and the volume. + The <quote>code</quote> can be a number 0 through 15, or a DTMF digit (0-9, A-D, *, #). + The <quote>duration</quote> is specified in milliseconds and defaults to 250, within + a range of 100-5000. The <quote>volume</quote> is specified in absolute decibels, with + a default of -8 db. + </para> + <para> + Multiple consecutive DTMF events can be queued up by calling this function multiple + times consecutively. Rtpengine will play out the DTMF events in sequence, separated + by a default pause of 100 ms. An alternative pause length can be given through the + <quote>pause</quote> option, between 100 and 5000 ms. + </para> + <example> + <title><function>play_dtmf</function> usage</title> + <programlisting format="linespecific"> +... +play_dtmf("from-tag=5yqaeriguhxcikxj code=#"); +play_dtmf("code=1 volume=5 duration=300 pause=150"); +... + </programlisting> + </example> + </section> + </section>

1 0

git:master:120a71be: rtpengine: add play_dtmf() command
by Richard Fuchs 22 Nov '19

22 Nov '19

Module: kamailio Branch: master Commit: 120a71bec0ee7a07f5f39262a038977f27bc7073 URL: https://github.com/kamailio/kamailio/commit/120a71bec0ee7a07f5f39262a038977… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-11-22T09:37:02-05:00 rtpengine: add play_dtmf() command --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/120a71bec0ee7a07f5f39262a038977… Patch: https://github.com/kamailio/kamailio/commit/120a71bec0ee7a07f5f39262a038977… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6e436083ec..9ccf8c4a74 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -138,6 +138,7 @@ static const char *command_strings[] = { [OP_STOP_FORWARDING] = "stop forwarding", [OP_PLAY_MEDIA] = "play media", [OP_STOP_MEDIA] = "stop media", + [OP_PLAY_DTMF] = "play DTMF", }; struct minmax_mos_stats { @@ -197,6 +198,7 @@ static int start_forwarding_f(struct sip_msg *, char *, char *); static int stop_forwarding_f(struct sip_msg *, char *, char *); static int play_media_f(struct sip_msg *, char *, char *); static int stop_media_f(struct sip_msg *, char *, char *); +static int play_dtmf_f(struct sip_msg *, char *, char *); static int rtpengine_answer1_f(struct sip_msg *, char *, char *); static int rtpengine_offer1_f(struct sip_msg *, char *, char *); static int rtpengine_delete1_f(struct sip_msg *, char *, char *); @@ -376,6 +378,9 @@ static cmd_export_t cmds[] = { {"stop_media", (cmd_function)stop_media_f, 0, 0, 0, ANY_ROUTE}, + {"play_dtmf", (cmd_function)play_dtmf_f, 1, + fixup_spve_null, 0, + ANY_ROUTE}, {"rtpengine_offer", (cmd_function)rtpengine_offer1_f, 0, 0, 0, ANY_ROUTE}, @@ -3839,6 +3844,12 @@ stop_media_f(struct sip_msg* msg, char *str1, char *str2) return rtpengine_generic_f(msg, str1, OP_STOP_MEDIA); } +static int +play_dtmf_f(struct sip_msg* msg, char *str1, char *str2) +{ + return rtpengine_generic_f(msg, str1, OP_PLAY_DTMF); +} + static int start_forwarding_f(struct sip_msg* msg, char *str1, char *str2) { diff --git a/src/modules/rtpengine/rtpengine.h b/src/modules/rtpengine/rtpengine.h index b5314c2c35..1e55cf244e 100644 --- a/src/modules/rtpengine/rtpengine.h +++ b/src/modules/rtpengine/rtpengine.h @@ -46,6 +46,7 @@ enum rtpe_operation { OP_STOP_FORWARDING, OP_PLAY_MEDIA, OP_STOP_MEDIA, + OP_PLAY_DTMF, OP_ANY, };

1 0

git:master:9da53bae: db_redis: performance improvements and fixes
by Richard Fuchs 22 Nov '19

22 Nov '19

Module: kamailio Branch: master Commit: 9da53baeadb0403de86d14fa7be826780382e315 URL: https://github.com/kamailio/kamailio/commit/9da53baeadb0403de86d14fa7be8267… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-11-22T08:35:49-05:00 db_redis: performance improvements and fixes - Support update of type key columns - Support range scans on timestamp and int keys through a series of wildcard matches when used with a < or > operator - Support exponential increase and fallof for SCAN - Pad bigint values to 10 digits for faster wildcard matching - Use KEYS instead of SCAN by default for faster keys matching - Support optional versioning of table names - Simulate non-unique indexes through parent sets for O(1) counting of entries --- Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_connection.h Modified: src/modules/db_redis/redis_dbase.c Modified: src/modules/db_redis/redis_dbase.h Modified: src/modules/db_redis/redis_table.c Modified: src/modules/db_redis/redis_table.h --- Diff: https://github.com/kamailio/kamailio/commit/9da53baeadb0403de86d14fa7be8267… Patch: https://github.com/kamailio/kamailio/commit/9da53baeadb0403de86d14fa7be8267…

1 0

rtpengine play DTMF from SIP INFO
by Giuseppe Pandolfi 22 Nov '19

22 Nov '19

Hi, I'm using kamailio (v. 5.2.1) and rtpengine (v. mr8.0.1.1) to test transcoding rtp. All works. From rtpengine documentation I see that ther is possibility to play DTMF tone from SIP INFO message using "play DTMF" ng control protocol message but I don't found rtpengine module function to do it, like block_dtmf(), unblock_dtmf(), ecc... What can I do to perform this feature? Thanks Giuseppe

3 2

← Newer
1
...
19
20
21
22
23
24
25
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019