sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:4.2:9e293335: docbook/Makefile: use default system catalog implicitely

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 9e293335585598e6f7bf7c9e58a0bee4cc9eb068 URL: https://github.com/kamailio/kamailio/commit/9e293335585598e6f7bf7c9e58a0bee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:12:33+01:00 docbook/Makefile: use default system catalog implicitely - custom catalog can be forced with nocatalog=no (cherry picked from commit 508b11011c85bb21e5bd4212a16fabb9136e22fa) --- Modified: docbook/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/9e293335585598e6f7bf7c9e58a0bee… Patch: https://github.com/kamailio/kamailio/commit/9e293335585598e6f7bf7c9e58a0bee… --- diff --git a/docbook/Makefile b/docbook/Makefile index 0fd61e2..ec5841d 100644 --- a/docbook/Makefile +++ b/docbook/Makefile @@ -99,6 +99,10 @@ html_css ?= /css/sr-doc.css # file or docbook xsl stylesheets are being installed. catalog ?= $(docbook_dir)/catalog.xml +# Use standard catalog from OS, set it to no to use the above path to a +# custom catalog file. +nocatalog ?= yes + lynx ?= lynx dia ?= dia xsltproc ?= xsltproc

9 years, 11 months

git:4.2:a30cfc6c: dispatcher: refrashed description of dispatching algorithm 8

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: a30cfc6c928721f32f1d0692f89e4183d468d614 URL: https://github.com/kamailio/kamailio/commit/a30cfc6c928721f32f1d0692f89e418… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:12:20+01:00 dispatcher: refrashed description of dispatching algorithm 8 - priority based selection (cherry picked from commit aaf6c2bde1d5e3cd4443ed09c3d5767828a4bda4) --- Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a30cfc6c928721f32f1d0692f89e418… Patch: https://github.com/kamailio/kamailio/commit/a30cfc6c928721f32f1d0692f89e418… --- diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 0159189..ce27422 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -802,7 +802,7 @@ modparam("dispatcher", "force_dst", 1) </listitem> <listitem> <para> - <quote>6</quote> - random (using rand()). + <quote>6</quote> - random destination (using rand()). </para> </listitem> <listitem> @@ -813,7 +813,8 @@ modparam("dispatcher", "force_dst", 1) </listitem> <listitem> <para> - <quote>8</quote> - use first destination (good for failover). + <quote>8</quote> - select destination sorted by priority + attribute value (serial forking ordered by priority). </para> </listitem> <listitem>

9 years, 11 months

git:4.2:d374e4b2: jsonrpc-c: fixed typo in header guard

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: d374e4b2b92dab4127df9a98ae9b374928f03a28 URL: https://github.com/kamailio/kamailio/commit/d374e4b2b92dab4127df9a98ae9b374… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:11:49+01:00 jsonrpc-c: fixed typo in header guard (cherry picked from commit 8f86d2f16af57dc26229f721c9cb86b7f68208cd) --- Modified: modules/jsonrpc-c/netstring.h --- Diff: https://github.com/kamailio/kamailio/commit/d374e4b2b92dab4127df9a98ae9b374… Patch: https://github.com/kamailio/kamailio/commit/d374e4b2b92dab4127df9a98ae9b374… --- diff --git a/modules/jsonrpc-c/netstring.h b/modules/jsonrpc-c/netstring.h index 68deeab..0c68fdf 100644 --- a/modules/jsonrpc-c/netstring.h +++ b/modules/jsonrpc-c/netstring.h @@ -23,7 +23,7 @@ */ #ifndef __NETSTRING_STREAM_H -#define __NETSTRNG_STREAM_H +#define __NETSTRING_STREAM_H #include <string.h>

9 years, 11 months

git:4.2:f8276f7c: presence: slot and presentity uri printed in log message

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: f8276f7c368250fb79d470467cda4fdf20d241cd URL: https://github.com/kamailio/kamailio/commit/f8276f7c368250fb79d470467cda4fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:10:45+01:00 presence: slot and presentity uri printed in log message - useful for understanding while deleting subscription from memory fails to find the item (cherry picked from commit 8006c3a2637342c21837e5332d3eeb75bb9bf7de) --- Modified: modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/f8276f7c368250fb79d470467cda4fd… Patch: https://github.com/kamailio/kamailio/commit/f8276f7c368250fb79d470467cda4fd… --- diff --git a/modules/presence/subscribe.c b/modules/presence/subscribe.c index 172372d..334dc32 100644 --- a/modules/presence/subscribe.c +++ b/modules/presence/subscribe.c @@ -470,7 +470,9 @@ void delete_subs(str* pres_uri, str* ev_name, str* to_tag, unsigned int hash_code= core_hash(pres_uri, ev_name, shtable_size); if(delete_shtable(subs_htable, hash_code, &subs) < 0) { LM_ERR("Failed to delete subscription from memory" - " [%.*s : %.*s / %.*s / %.*s]\n", ev_name->len, ev_name->s, + " [slot: %u ev: %.*s pu: %.*s ci: %.*s ft: %.*s tt: %.*s]\n", + hash_code, pres_uri->len, pres_uri->s, + ev_name->len, ev_name->s, callid->len, callid->s, from_tag->len, from_tag->s, to_tag->len, to_tag->s); }

9 years, 11 months

Jansson module

by Olle E. Johansson

Hi! The jansson module for the jansson library does not document the dependency of the jansson library. The README should have a URL and possibly package names for the library. Thanks, /O

9 years, 11 months

rtpengine: set source ip for kamailio socket proposed solution

by Lucian Balaceanu

Hi, At 1&1 we found it useful to be able to specify the binding interface on which kamailio should communicate with rtpengine. We introduced a non mandatory parameter "force_send_interface" that expects an IPv4 IP to be used in binding the rtpengine communication responsible sockets. We propose the attached patch and welcome any observations regarding it. Thank you

9 years, 11 months

git:master:0076763e: rtpengine: remove Svn Id tags and history

by Richard Fuchs

Module: kamailio Branch: master Commit: 0076763ec428f94ff4dfb75c07f8d7c816e9c226 URL: https://github.com/kamailio/kamailio/commit/0076763ec428f94ff4dfb75c07f8d7c… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2015-01-15T12:59:05-05:00 rtpengine: remove Svn Id tags and history --- Modified: modules/rtpengine/Makefile Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_db.c Modified: modules/rtpengine/rtpengine_funcs.c Modified: modules/rtpengine/rtpengine_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/0076763ec428f94ff4dfb75c07f8d7c… Patch: https://github.com/kamailio/kamailio/commit/0076763ec428f94ff4dfb75c07f8d7c…

9 years, 11 months

git:master:56164cfc: rtpengine: update README

by Richard Fuchs

Module: kamailio Branch: master Commit: 56164cfceb1e164ee01a3993bad3a2590f0a2108 URL: https://github.com/kamailio/kamailio/commit/56164cfceb1e164ee01a3993bad3a25… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2015-01-15T12:51:57-05:00 rtpengine: update README --- Modified: modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/56164cfceb1e164ee01a3993bad3a25… Patch: https://github.com/kamailio/kamailio/commit/56164cfceb1e164ee01a3993bad3a25…

9 years, 11 months

git:master:66fe1f64: rtpengine: update docs for force_send_interface

by Richard Fuchs

Module: kamailio Branch: master Commit: 66fe1f64dfff41ff048b9d8c6e471f86f569eebb URL: https://github.com/kamailio/kamailio/commit/66fe1f64dfff41ff048b9d8c6e471f8… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2015-01-15T12:51:48-05:00 rtpengine: update docs for force_send_interface --- Modified: modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/66fe1f64dfff41ff048b9d8c6e471f8… Patch: https://github.com/kamailio/kamailio/commit/66fe1f64dfff41ff048b9d8c6e471f8… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index fdc9a2d..1ea4efd 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -239,6 +239,28 @@ modparam("rtpengine", "setid_avp", "$avp(setid)") </example> </section> + <section id="rtpengine.p.force_send_interface"> + <title><varname>force_send_interface</varname> (string)</title> + <para> + Forces all control messages between the &sip; proxy and + the &rtp; proxy to be sent from the specified local + interface. Only IPv4 addresses are supported so far. If + not specified, the default interface selected by the + operating system will be used. + </para> + <para> + There is no default value. + </para> + <example> + <title>Set <varname>force_send_interface</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "force_send_interface", "10.3.7.123") +... +</programlisting> + </example> + </section> + </section> <section>

9 years, 11 months

git:master:5ed51f55: rtpengine: new modparam force_send_interface

by Richard Fuchs

Module: kamailio Branch: master Commit: 5ed51f55985b20f8e24752a03e7b5fd3c106bfe0 URL: https://github.com/kamailio/kamailio/commit/5ed51f55985b20f8e24752a03e7b5fd… Author: Lucian Balanceanu <lucian.balanceanu(a)1and1.ro> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2015-01-15T12:50:36-05:00 rtpengine: new modparam force_send_interface Binds control sockets to the specified local interface. IPv4 only. Patch by Lucian Balanceanu <lucian.balanceanu(a)1and1.ro> --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/5ed51f55985b20f8e24752a03e7b5fd… Patch: https://github.com/kamailio/kamailio/commit/5ed51f55985b20f8e24752a03e7b5fd… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index af181f9..328cbe5 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -354,6 +354,8 @@ static int *rtpp_socks = 0; static int setid_avp_type; static int_str setid_avp; +char* force_send_ip_str=""; + typedef struct rtpp_set_link { struct rtpp_set *rset; pv_spec_t *rpv; @@ -421,6 +423,7 @@ static param_export_t params[] = { {"url_col", PARAM_STR, &rtpp_url_col }, {"extra_id_pv", PARAM_STR, &extra_id_pv_param }, {"setid_avp", PARAM_STRING, &setid_avp_param }, + {"force_send_interface", PARAM_STRING, &force_send_ip_str }, {0, 0, 0} }; @@ -629,7 +632,6 @@ int add_rtpengine_socks(struct rtpp_set * rtpp_list, char * rtpproxy) pnode->rn_url.s[p2 - p1] = 0; pnode->rn_url.len = p2-p1; - LM_DBG("url is %s, len is %i\n", pnode->rn_url.s, pnode->rn_url.len); /* Leave only address in rn_address */ pnode->rn_address = pnode->rn_url.s; if (strncasecmp(pnode->rn_address, "udp:", 4) == 0) { @@ -918,6 +920,7 @@ mod_init(void) pv_spec_t *avp_spec; unsigned short avp_flags; str s; + unsigned char ip_buff[sizeof(struct in6_addr)]; if(register_mi_mod(exports.name, mi_cmds)!=0) { @@ -990,6 +993,12 @@ mod_init(void) memset(&tmb, 0, sizeof(struct tm_binds)); } + if ( 0 != strlen(force_send_ip_str)) { + if ( inet_pton(AF_INET, force_send_ip_str, ip_buff) <= 0) { + LM_ERR("Invalid IP address for force_send_interface <%s>\n", force_send_ip_str); + return -1; + } + } return 0; } @@ -1002,6 +1011,8 @@ child_init(int rank) struct addrinfo hints, *res; struct rtpp_set *rtpp_list; struct rtpp_node *pnode; + struct sockaddr_in tmp, ip4addr; + socklen_t sock_len = sizeof(struct sockaddr); if(rtpp_set_list==NULL ) return 0; @@ -1064,6 +1075,25 @@ child_init(int rank) return -1; } + if (strlen(force_send_ip_str)!=0) { + memset(&ip4addr, 0, sizeof(ip4addr)); + ip4addr.sin_family = AF_INET; + ip4addr.sin_port = htons(0); + inet_pton(AF_INET, force_send_ip_str, &ip4addr.sin_addr); + + if (bind(rtpp_socks[pnode->idx], (struct sockaddr*)&ip4addr, sizeof(ip4addr)) <0) { + LM_ERR("can't bind socket to required interface \n"); + close( rtpp_socks[pnode->idx] ); + rtpp_socks[pnode->idx] = -1; + freeaddrinfo(res); + return -1; + } + + memset(&tmp, 0, sizeof(tmp)); sock_len = sizeof(struct sockaddr); + getsockname(rtpp_socks[pnode->idx], (struct sockaddr *) &tmp, &sock_len); + LM_INFO("Binding on %s:%d\n", inet_ntoa(tmp.sin_addr), ntohs(tmp.sin_port)); + } + if (connect( rtpp_socks[pnode->idx], res->ai_addr, res->ai_addrlen) == -1) { LM_ERR("can't connect to a RTP proxy\n"); close( rtpp_socks[pnode->idx] );

9 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015