sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
341 discussions

git:master:5113c047: kazoo : fix memset size error & includes
by Luis Azedo 06 Feb '15

06 Feb '15

Module: kamailio Branch: master Commit: 5113c047d353724d1a6f5a204e5a895ff1dd519a URL: https://github.com/kamailio/kamailio/commit/5113c047d353724d1a6f5a204e5a895… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-06T16:08:54Z kazoo : fix memset size error & includes kz_trans was calling memset with wrong size of structure kx_amqp was including uuid.h from uuid directory --- Modified: modules/kazoo/kz_amqp.c Modified: modules/kazoo/kz_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/5113c047d353724d1a6f5a204e5a895… Patch: https://github.com/kamailio/kamailio/commit/5113c047d353724d1a6f5a204e5a895… --- diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 29028d4..4fba7fe 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -5,7 +5,7 @@ #include <amqp_framing.h> #include <amqp_tcp_socket.h> #include <json.h> -#include <uuid/uuid.h> +#include <uuid.h> #include "../../mem/mem.h" #include "../../timer_proc.h" #include "../../sr_module.h" diff --git a/modules/kazoo/kz_trans.c b/modules/kazoo/kz_trans.c index eb2ea64..e041ab0 100644 --- a/modules/kazoo/kz_trans.c +++ b/modules/kazoo/kz_trans.c @@ -172,7 +172,7 @@ void kz_free_pv_value(pv_value_t *val ) { pv_value_t* kz_alloc_pv_value() { pv_value_t* v = (pv_value_t*) pkg_malloc(sizeof(pv_value_t)); if(v != NULL) - memset(v, 0, sizeof(pv_value_t*)); + memset(v, 0, sizeof(pv_value_t)); return v; }

1 0

New module proposal: TCP keepalive
by Camille Oudot 06 Feb '15

06 Feb '15

Hi, I'm currently working on a new module, that allows setting the TCP keepalive options by socket, on demand, through the kamailio cfg: https://github.com/kamailio/kamailio/tree/coudot/tcp_keepalive/modules/tcp_… This allows turning this mechanism on only when needed during the whole lifetime of a SIP/TCP connection. In our case, this would be only during a media session, to efficiently detect a disconnection (clients are smartphones on mobile network). Then, disabling keepalive when the session ends allows to save on network traffic, and battery for the client. Setting the options on the socket is straightforward when the TCP worker owns the file descriptor, but it's more tricky when it does not. In the latter case, I've been re-using the core functions from pass_fd.c. Are the functions from pass_fd safe to use from modules? Apart from close()ing the fd after setting the sock options, is there anything to take care of in term of resource locking or releasing? Any feedback is appreciated. Cheers, -- Camille

3 6

reminder: document new features in the wiki
by Victor Seva 06 Feb '15

06 Feb '15

Hi, I would just like to remind everybody that new features should be documented in the wiki [0] I've just added the tcpops new module. Cheers, Victor [0] https://www.kamailio.org/wiki/features/new-in-devel

1 0

git:4.2:5e07d01a: dmq: add branches when replicating to multiple nodes
by Charles Chance 06 Feb '15

06 Feb '15

Module: kamailio Branch: 4.2 Commit: 5e07d01aaae15d3441876d8ee154a53484d08682 URL: https://github.com/kamailio/kamailio/commit/5e07d01aaae15d3441876d8ee154a53… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-02-06T12:53:57Z dmq: add branches when replicating to multiple nodes - reported by Leonardo Arena (cherry picked from commit ff114281fc2f523ed7bf87ea31448ce7327fdf93) --- Modified: modules/dmq/dmq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/5e07d01aaae15d3441876d8ee154a53… Patch: https://github.com/kamailio/kamailio/commit/5e07d01aaae15d3441876d8ee154a53… --- diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c index 7430193..2ec32d2 100644 --- a/modules/dmq/dmq_funcs.c +++ b/modules/dmq/dmq_funcs.c @@ -24,6 +24,7 @@ #include "dmq_funcs.h" #include "notification_peer.h" +#include "../../dset.h" /** * @brief register a DMQ peer @@ -385,6 +386,7 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s) dmq_node_t* node; struct socket_info* sock; int i = 0; + int first = 1; /* avoid loops - do not replicate if message has come from another node * (override if optional parameter is set) @@ -413,10 +415,22 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s) node = node->next; continue; } + + if (!first) { + if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, sock, 0, 0, 0, 0) == -1) { + LM_ERR("failed to append a branch\n"); + node = node->next; + continue; + } + } else { + first = 0; + } + if(tmb.t_replicate(msg, &node->orig_uri) < 0) { LM_ERR("error calling t_replicate\n"); goto error; } + node = node->next; } lock_release(&node_list->lock);

1 0

git:master:927de0d6: modules/tcpops: renamed functions to prevent conflicts
by Camille Oudot 06 Feb '15

06 Feb '15

Module: kamailio Branch: master Commit: 927de0d6fc0ab75212ae177c871085bdcc0115e2 URL: https://github.com/kamailio/kamailio/commit/927de0d6fc0ab75212ae177c871085b… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-06T12:27:24+01:00 modules/tcpops: renamed functions to prevent conflicts --- Modified: modules/tcpops/tcpops.c Modified: modules/tcpops/tcpops.h Modified: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/927de0d6fc0ab75212ae177c871085b… Patch: https://github.com/kamailio/kamailio/commit/927de0d6fc0ab75212ae177c871085b…

1 0

git:master:5193ff25: modules/tcpops: new module to tweak TCP options
by Camille Oudot 06 Feb '15

06 Feb '15

Module: kamailio Branch: master Commit: 5193ff25446ba6de8ee9c2fcaa82d402e4262075 URL: https://github.com/kamailio/kamailio/commit/5193ff25446ba6de8ee9c2fcaa82d40… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-06T12:27:24+01:00 modules/tcpops: new module to tweak TCP options This module adds the ability to control TCP options (currently only keepalive) through the kamailio cfg, on demand, and on a per-socket basis. --- Added: modules/tcpops/Makefile Added: modules/tcpops/README Added: modules/tcpops/doc/Makefile Added: modules/tcpops/doc/functions.xml Added: modules/tcpops/doc/params.xml Added: modules/tcpops/doc/tcpops.xml Added: modules/tcpops/tcpops.c Added: modules/tcpops/tcpops.h Added: modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5193ff25446ba6de8ee9c2fcaa82d40… Patch: https://github.com/kamailio/kamailio/commit/5193ff25446ba6de8ee9c2fcaa82d40…

1 0

git:master:ff114281: dmq: add branches when replicating to multiple nodes
by Charles Chance 06 Feb '15

06 Feb '15

Module: kamailio Branch: master Commit: ff114281fc2f523ed7bf87ea31448ce7327fdf93 URL: https://github.com/kamailio/kamailio/commit/ff114281fc2f523ed7bf87ea31448ce… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-02-06T10:59:35Z dmq: add branches when replicating to multiple nodes - reported by Leonardo Arena --- Modified: modules/dmq/dmq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/ff114281fc2f523ed7bf87ea31448ce… Patch: https://github.com/kamailio/kamailio/commit/ff114281fc2f523ed7bf87ea31448ce… --- diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c index b31deba..a3611e8 100644 --- a/modules/dmq/dmq_funcs.c +++ b/modules/dmq/dmq_funcs.c @@ -24,6 +24,7 @@ #include "dmq_funcs.h" #include "notification_peer.h" +#include "../../dset.h" /** * @brief register a DMQ peer @@ -385,6 +386,7 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s) dmq_node_t* node; struct socket_info* sock; int i = 0; + int first = 1; /* avoid loops - do not replicate if message has come from another node * (override if optional parameter is set) @@ -413,10 +415,22 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s) node = node->next; continue; } + + if (!first) { + if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, sock, 0, 0, 0, 0) == -1) { + LM_ERR("failed to append a branch\n"); + node = node->next; + continue; + } + } else { + first = 0; + } + if(tmb.t_replicate(msg, &node->orig_uri) < 0) { LM_ERR("error calling t_replicate\n"); goto error; } + node = node->next; } lock_release(&node_list->lock);

1 0

Append branches in module
by Charles Chance 06 Feb '15

06 Feb '15

Hi All, Can anyone confirm, is this safe? Primary use case is replication of REGISTER after local save(). diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c index b31deba..a3611e8 100644 --- a/modules/dmq/dmq_funcs.c +++ b/modules/dmq/dmq_funcs.c @@ -24,6 +24,7 @@ #include "dmq_funcs.h" #include "notification_peer.h" +#include "../../dset.h" /** * @brief register a DMQ peer @@ -385,6 +386,7 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s) dmq_node_t* node; struct socket_info* sock; int i = 0; + int first = 1; /* avoid loops - do not replicate if message has come from another node * (override if optional parameter is set) @@ -413,10 +415,22 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s) node = node->next; continue; } + + if (!first) { + if (append_branch(msg, 0, 0, 0, Q_UNSPECIFIED, 0, sock, 0, 0, 0, 0) == -1) { + LM_ERR("failed to append a branch\n"); + node = node->next; + continue; + } + } else { + first = 0; + } + if(tmb.t_replicate(msg, &node->orig_uri) < 0) { LM_ERR("error calling t_replicate\n"); goto error; } + node = node->next; } lock_release(&node_list->lock); Many thanks, Charles -- www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, Birmingham Science Park, Birmingham B7 4BB.

2 5

git:4.2:f30a61f3: kazoo : less agressive log
by Luis Azedo 05 Feb '15

05 Feb '15

Module: kamailio Branch: 4.2 Commit: f30a61f339f947783210053469d262e61ce58638 URL: https://github.com/kamailio/kamailio/commit/f30a61f339f947783210053469d262e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-05T22:35:32Z kazoo : less agressive log changed log from INFO to DEBUG when timeout is set (cherry picked from commit f9c248a66fdca5317e8820e53f1a0f99cd58ef8a) --- Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/f30a61f339f947783210053469d262e… Patch: https://github.com/kamailio/kamailio/commit/f30a61f339f947783210053469d262e… --- diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 1c109bb..29028d4 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -851,7 +851,7 @@ int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, cha if((pv_val.flags & PV_VAL_INT) && pv_val.ri != 0 ) { kz_timeout.tv_usec = 0; kz_timeout.tv_sec = pv_val.ri; - LM_INFO("SET TIMEOUT TO %i\n", kz_timeout.tv_sec); + LM_DBG("SET TIMEOUT TO %i\n", (int) kz_timeout.tv_sec); } } }

1 0

git:4.2:090afb32: kazoo : timeout fixes & improvements
by Luis Azedo 05 Feb '15

05 Feb '15

Module: kamailio Branch: 4.2 Commit: 090afb32c19b8e76fcbcb6deaaa2f4fe42e0f38f URL: https://github.com/kamailio/kamailio/commit/090afb32c19b8e76fcbcb6deaaa2f4f… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-05T19:45:29Z kazoo : timeout fixes & improvements 1) fixes names in parameters (timout corrected to timeout) 2) kazoo_query was always using the same timeout value which could be a problem, since there are different kinds of request and some may be given more time to process. solved by adding amqp_query_timeout_avp parameter to allow usage of different timeouts. (cherry picked from commit 0c3925e6f787c6e8d2e1bc7a45fec0c99ba203d8) --- Modified: modules/kazoo/doc/kazoo_admin.xml Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/090afb32c19b8e76fcbcb6deaaa2f4f… Patch: https://github.com/kamailio/kamailio/commit/090afb32c19b8e76fcbcb6deaaa2f4f…

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
35
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 2015