sr-dev February 2018

sr-dev@lists.kamailio.org

33 participants
356 discussions

git:master:224cdfe4: db_redis: declare variable at beginning of function
by Daniel-Constantin Mierla 21 Feb '18

21 Feb '18

Module: kamailio Branch: master Commit: 224cdfe4999dfc1084f61dfe2130230d843f8296 URL: https://github.com/kamailio/kamailio/commit/224cdfe4999dfc1084f61dfe2130230… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-21T08:17:46+01:00 db_redis: declare variable at beginning of function - doing it inside for statement breaks compiling with less than C99 - reported in Jenkings debs building log --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/224cdfe4999dfc1084f61dfe2130230… Patch: https://github.com/kamailio/kamailio/commit/224cdfe4999dfc1084f61dfe2130230… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index d81f1a973c..c0a6c383d1 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -25,8 +25,10 @@ #include "redis_table.h" static void print_query(redis_key_t *query) { + redis_key_t *k; + LM_DBG("Query dump:\n"); - for (redis_key_t *k = query; k; k = k->next) { + for (k = query; k; k = k->next) { LM_DBG(" %s\n", k->key.s); } }

1 0

question on RPC script reload: how is it invoked in the workers?
by Anthony Alba 20 Feb '18

20 Feb '18

Hi list, I am looking at the python script reload functionality exposed by the rpc command "app_python.reload" and implemented by the function app_python_rpc_reload. The implementation increments a version number and calls apy_reload_script(). But it looks like apy_reload_script() would be run invoked in the process where the RPC server lives rather than the children. How is it sent to the workers for invocation? I think I am misunderstanding how the RPC server works: how do you differentiate between RPC functions meant to be executed by the master vs sent to all the slaves? Thanks Anthony

2 3

rtpengine transcoding with libs other than ffmpeg
by Jeff Brower 20 Feb '18

20 Feb '18

It's great to see that rtpengine now supports transcoding. I always watched rtpproxy (for so many years) to see when it might happen. I have some questions. I could not find on ffmpeg.org specific mention of: -advanced audio jitter buffer capability -advanced RTP related RFCs, eg. RFC 8108 -advanced codec capability, eg. G711 Appendix II (DTX and CNG) In particular, it's not clear to me where jitter buffer and RTP RFCs are handled -- inside rtpgengine or ffmpeg. I don't see any mention of jitter buffer on the rtpengine web and github pages. In general ffmpeg's focus is on content delivery and not bidirectional real-time communication. My questions: 1) Is there an rtpengine-ffmpeg software architecture or data flow diagram available ? 2) Is it possible to connect libraries besides ffmpeg to the "other side" of rtpengine ? For example, using the rtpengine interface, send and receive a UDP/RTP packet stream to/from a third-party library and let it handle jitter buffer, encoding/decoding, ptime mismatch (transrating), and more ? 3) If architecturally that's a do-able thing, is there a spec on how rtpengine is currently interfacing to ffmpeg ? Which APIs are being used ? (I assume the command line interface is not being used). Re. ffmpeg APIs I found this: http://dranger.com/ffmpeg/ but maybe there is something more recent or rtpengine source code we can look at. Thanks. -Jeff

2 1

git:master:7da5e5b0: tm: flag core to use forced socket when uac socket is set
by Daniel-Constantin Mierla 20 Feb '18

20 Feb '18

Module: kamailio Branch: master Commit: 7da5e5b0a1f4520c7fdd7eeb23b4b58ecc27be22 URL: https://github.com/kamailio/kamailio/commit/7da5e5b0a1f4520c7fdd7eeb23b4b58… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-20T21:59:07+01:00 tm: flag core to use forced socket when uac socket is set - without flag SND_F_FORCE_SOCKET probing by dispatcher module and route script function t_uac_send() will choose incorrect source socket --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/7da5e5b0a1f4520c7fdd7eeb23b4b58… Patch: https://github.com/kamailio/kamailio/commit/7da5e5b0a1f4520c7fdd7eeb23b4b58… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 7b78a609b3..ff466760dd 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -428,6 +428,12 @@ static inline int t_uac_prepare(uac_req_t *uac_r, /* new message => take the dialog send_socket if set, or the default send_socket if not*/ SND_FLAGS_INIT(&snd_flags); + + if (uac_r->dialog->send_sock != NULL) + { + snd_flags.f |= SND_F_FORCE_SOCKET; + } + #ifdef USE_DNS_FAILOVER if ((uri2dst2(cfg_get(core, core_cfg, use_dns_failover) ? &new_cell->uac[0].dns_h : 0, &dst, uac_r->dialog->send_sock, snd_flags,

1 0

[kamailio/kamailio] tm: flag core to use forced socket when uac socket is set (#1451)
by Mikko Lehto 20 Feb '18

20 Feb '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 While testing Kamailio instance with multiple interfaces I noticed that dispatcher probing does not use the socket defined on dispatcher ```list_file```. By setting flag ```SND_F_FORCE_SOCKET```, in tm module, dispatcher probing or tm t_uac_send() is sourced as per ```socket``` attribute. Tested on FreeBSD 11.1 and Ubuntu 16.04. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1451 -- Commit Summary -- * tm: flag core to use forced socket when uac socket is set -- File Changes -- M src/modules/tm/uac.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1451.patch https://github.com/kamailio/kamailio/pull/1451.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/1451

2 2

git:master:34293750: Merge pull request #1442 from hdikme/control_command_tos
by GitHub 20 Feb '18

20 Feb '18

Module: kamailio Branch: master Commit: 34293750753280229a6e546a12a8a59871d758b0 URL: https://github.com/kamailio/kamailio/commit/34293750753280229a6e546a12a8a59… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: GitHub <noreply(a)github.com> Date: 2018-02-20T12:21:35-05:00 Merge pull request #1442 from hdikme/control_command_tos rtpengine: setting tos value for the control commands --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/34293750753280229a6e546a12a8a59… Patch: https://github.com/kamailio/kamailio/commit/34293750753280229a6e546a12a8a59… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index bc31168f63..af0c147d50 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -1965,6 +1965,27 @@ modparam("rtpengine", "mos_average_samples_B_pv", "$avp(mos_average_samples_B)") </example> </section> + <section id="rtpengine.p.control_cmd_tos"> + <title><varname>control_cmd_tos</varname> (integer)</title> + <para> + The parameter is used to set the value of <quote>type of service (tos)</quote> for the control commands (such as rtpengine_offer(), rtpengine_answer() etc). + </para> + <para> + There is no default value. By default this feature is not used. + </para> + <para> + The values not falling into the range <quote>0-255</quote> will be simply ignored. + </para> + <example> + <title>Set <varname>control_cmd_tos</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "control_cmd_tos", "144") +... +</programlisting> + </example> + </section> + </section> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 3b41789bbf..9fd827b987 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -209,6 +209,7 @@ static int pv_parse_var(str *inp, pv_elem_t **outp, int *got_any); static int mos_label_stats_parse(struct minmax_mos_label_stats *mmls); static void parse_call_stats(bencode_item_t *, struct sip_msg *); +static int control_cmd_tos = -1; static int rtpengine_allow_op = 0; static struct rtpp_node **queried_nodes_ptr = NULL; static pid_t mypid; @@ -341,6 +342,7 @@ static param_export_t params[] = { {"queried_nodes_limit", INT_PARAM, &default_rtpengine_cfg.queried_nodes_limit }, {"rtpengine_tout_ms", INT_PARAM, &default_rtpengine_cfg.rtpengine_tout_ms }, {"rtpengine_allow_op", INT_PARAM, &rtpengine_allow_op }, + {"control_cmd_tos", INT_PARAM, &control_cmd_tos }, {"db_url", PARAM_STR, &rtpp_db_url }, {"table_name", PARAM_STR, &rtpp_table_name }, {"setid_col", PARAM_STR, &rtpp_setid_col }, @@ -1675,6 +1677,20 @@ static int build_rtpp_socks() { LM_WARN("Failed enable set MTU discovery socket option\n"); #endif + if((0 <= control_cmd_tos) && (control_cmd_tos < 256)) { + unsigned char tos = control_cmd_tos; + if (pnode->rn_umode == 6) { + setsockopt(rtpp_socks[pnode->idx], IPPROTO_IPV6, + IPV6_TCLASS, &control_cmd_tos, + sizeof(control_cmd_tos)); + + } else { + setsockopt(rtpp_socks[pnode->idx], IPPROTO_IP, + IP_TOS, &tos, + sizeof(tos)); + } + } + if (bind_force_send_ip(pnode->idx) == -1) { LM_ERR("can't bind socket\n"); close(rtpp_socks[pnode->idx]);

1 0

git:master:5fef3a6d: rtpengine: setting tos value for the control commands
by Huseyin Dikme 20 Feb '18

20 Feb '18

Module: kamailio Branch: master Commit: 5fef3a6dc02543dcdced6f935da4b23f7702a050 URL: https://github.com/kamailio/kamailio/commit/5fef3a6dc02543dcdced6f935da4b23… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: 2018-02-20T13:25:07+01:00 rtpengine: setting tos value for the control commands - A parameter "control_cmd_tos" has been created in order to set the type of service for the control channel. --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/5fef3a6dc02543dcdced6f935da4b23… Patch: https://github.com/kamailio/kamailio/commit/5fef3a6dc02543dcdced6f935da4b23… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index bc31168f63..af0c147d50 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -1965,6 +1965,27 @@ modparam("rtpengine", "mos_average_samples_B_pv", "$avp(mos_average_samples_B)") </example> </section> + <section id="rtpengine.p.control_cmd_tos"> + <title><varname>control_cmd_tos</varname> (integer)</title> + <para> + The parameter is used to set the value of <quote>type of service (tos)</quote> for the control commands (such as rtpengine_offer(), rtpengine_answer() etc). + </para> + <para> + There is no default value. By default this feature is not used. + </para> + <para> + The values not falling into the range <quote>0-255</quote> will be simply ignored. + </para> + <example> + <title>Set <varname>control_cmd_tos</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "control_cmd_tos", "144") +... +</programlisting> + </example> + </section> + </section> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 3b41789bbf..9fd827b987 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -209,6 +209,7 @@ static int pv_parse_var(str *inp, pv_elem_t **outp, int *got_any); static int mos_label_stats_parse(struct minmax_mos_label_stats *mmls); static void parse_call_stats(bencode_item_t *, struct sip_msg *); +static int control_cmd_tos = -1; static int rtpengine_allow_op = 0; static struct rtpp_node **queried_nodes_ptr = NULL; static pid_t mypid; @@ -341,6 +342,7 @@ static param_export_t params[] = { {"queried_nodes_limit", INT_PARAM, &default_rtpengine_cfg.queried_nodes_limit }, {"rtpengine_tout_ms", INT_PARAM, &default_rtpengine_cfg.rtpengine_tout_ms }, {"rtpengine_allow_op", INT_PARAM, &rtpengine_allow_op }, + {"control_cmd_tos", INT_PARAM, &control_cmd_tos }, {"db_url", PARAM_STR, &rtpp_db_url }, {"table_name", PARAM_STR, &rtpp_table_name }, {"setid_col", PARAM_STR, &rtpp_setid_col }, @@ -1675,6 +1677,20 @@ static int build_rtpp_socks() { LM_WARN("Failed enable set MTU discovery socket option\n"); #endif + if((0 <= control_cmd_tos) && (control_cmd_tos < 256)) { + unsigned char tos = control_cmd_tos; + if (pnode->rn_umode == 6) { + setsockopt(rtpp_socks[pnode->idx], IPPROTO_IPV6, + IPV6_TCLASS, &control_cmd_tos, + sizeof(control_cmd_tos)); + + } else { + setsockopt(rtpp_socks[pnode->idx], IPPROTO_IP, + IP_TOS, &tos, + sizeof(tos)); + } + } + if (bind_force_send_ip(pnode->idx) == -1) { LM_ERR("can't bind socket\n"); close(rtpp_socks[pnode->idx]);

1 0

[kamailio/kamailio] rtpengine: setting tos value for the control commands (#1442)
by hdikme 20 Feb '18

20 Feb '18

- A parameter "control_cmd_tos" has been created in order to set the type of service for the control channel.   #### 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 A parameter "control_cmd_tos" has been created in order to set the type of service for the control channel. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1442 -- Commit Summary -- * rtpengine: setting tos value for the control commands -- File Changes -- M src/modules/rtpengine/doc/rtpengine_admin.xml (21) M src/modules/rtpengine/rtpengine.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1442.patch https://github.com/kamailio/kamailio/pull/1442.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/1442

2 5

[kamailio/kamailio] dmq_usrloc: contacts not deleted while 0x04 flag set in save() function (#1445)
by Guillaume Bour 20 Feb '18

20 Feb '18

### Description Hello, related to #265 , I can reproduce the issue, with kamailio 4.4.6+jessie from kamailio debian repository - 0x04 flag is set on save() - old contacts are deleted on the server receiving the REGISTER message - old contacts are not deleted on servers being notified via DMQ  ### Troubleshooting #### Reproduction - Setup 2 servers with dmq & dmq_usrloc replication between each other, and with registration on 1st - Use 0x04 flag on save() function - Register your softphones a 1st time on 1 server: registration is replicated on 2d server, contact is on both servers - Reregister (with different contact) on same server: - previous contact is deleted on 1st server - new contact is replicated to 2d server - previous contact is *NOT* delete on 2d server #### Log Messages server1 (REGISTER message): DEBUG: usrloc [ucontact.c:1692]: update_ucontact(): exists callback for type= UL_CONTACT_UPDATE DEBUG: usrloc [ul_callback.h:84]: run_ul_callbacks(): contact=0x7f0096e0b548, callback type 2/15, id 0 entered DEBUG: dmq_usrloc [usrloc_sync.c:578]: dmq_ul_cb_contact(): Callback from usrloc with type=2 DEBUG: dmq_usrloc [usrloc_sync.c:548]: usrloc_dmq_send_contact(): sending serialized data {"action":1,"aor":"+33564093848","ruid":"uloc-5a86b8c5-31e0-2","c":"sip:+33564093848@xxx:41502;ob","received":"","path":"","callid":"ntoWjs3R3WpP9Z5rsi7Npmr2rRGKstls","user_agent":"CSipSimple_porridge-23/r2457","instance":"","expires":1518779539,"cseq":55952,"flags":0,"cflags":0,"q":-1,"last_modified":1518778639,"methods":8159,"reg_id":0} DEBUG: dmq_usrloc [usrloc_sync.c:299]: usrloc_dmq_send(): sending dmq broadcast... server2 (DMQ recipient): DEBUG: dmq_usrloc [usrloc_sync.c:327]: usrloc_dmq_handle_msg(): dmq message received from sip:usrloc@172.16.67.15:5060 DEBUG: dmq_usrloc [usrloc_sync.c:429]: usrloc_dmq_handle_msg(): Received DMQ_UPDATE. Update contact info... DEBUG: dmq_usrloc [usrloc_sync.c:64]: add_contact(): aor: +33564093848 DEBUG: dmq_usrloc [usrloc_sync.c:65]: add_contact(): ci->ruid: uloc-5a86b8c5-31e0-2 DEBUG: dmq_usrloc [usrloc_sync.c:66]: add_contact(): aorhash: -1799456359 DEBUG: dmq_usrloc [usrloc_sync.c:72]: add_contact(): Found contact DEBUG: usrloc [ucontact.c:1692]: update_ucontact(): exists callback for type= UL_CONTACT_UPDATE DEBUG: usrloc [ul_callback.h:84]: run_ul_callbacks(): contact=0x7f3900243bd0, callback type 2/15, id 0 entered DEBUG: dmq_usrloc [usrloc_sync.c:578]: dmq_ul_cb_contact(): Callback from usrloc with type=2 DEBUG: dmq_usrloc [usrloc_sync.c:600]: dmq_ul_cb_contact(): Contact received from DMQ... skip DEBUG: usrloc [ucontact.c:1004]: db_update_ucontact_ruid(): ruid:uloc-5a86b8c5-31e0-2 DEBUG: usrloc [ucontact.c:1133]: db_update_ucontact_ruid(): contact:sip:+33564093848@xxx:41502;ob DEBUG: dmq_usrloc [usrloc_sync.c:74]: add_contact(): Release record DEBUG: dmq_usrloc [usrloc_sync.c:76]: add_contact(): Unlock udomain the recipient receive an UPDATE message only. according to usrloc_sync.c:usrloc_dmq_handle_msg(), UPDATE message add the new contact only (execute add_contact()), but the other one is not deleted and there is no DMQ_RM message generated from the emitter ### Possible Solutions  ### Additional Information ``` version: kamailio 4.4.6 (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**: ``` 3.16.0-4-amd64 #1 SMP Debian 3.16.43-2+deb8u2 (2017-06-26) 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/1445

2 5

git:master:fd9fe3a6: db_redis: re-do appended commands after reconnect
by Andreas Granig 20 Feb '18

20 Feb '18

Module: kamailio Branch: master Commit: fd9fe3a677cde97dbf00ef965c45e5b6a495edf7 URL: https://github.com/kamailio/kamailio/commit/fd9fe3a677cde97dbf00ef965c45e5b… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-02-20T11:12:57+01:00 db_redis: re-do appended commands after reconnect Since hiredis sends out the pipelined command only after calling redisGetReply(), we need a mechamism to queue up all appended commands, so we can re-queue them once the connection is re-established. This commit introduces a redis command queue used for pipelined commands to re-do all appended commands in case of a connection drop (which typically happens in db-mode write-through with very low traffic, where redis would close the connection due to inactivity). --- 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.h --- Diff: https://github.com/kamailio/kamailio/commit/fd9fe3a677cde97dbf00ef965c45e5b… Patch: https://github.com/kamailio/kamailio/commit/fd9fe3a677cde97dbf00ef965c45e5b…

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2018