sr-dev March 2015

sr-dev@lists.kamailio.org

34 participants
191 discussions

git:master:d9ef80e8: rr: new variable $rdir(key)
by Daniel-Constantin Mierla 10 Mar '15

10 Mar '15

Module: kamailio Branch: master Commit: d9ef80e8123bec0ebf09b5ce464a9829dd835f8f URL: https://github.com/kamailio/kamailio/commit/d9ef80e8123bec0ebf09b5ce464a982… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-10T10:40:00+01:00 rr: new variable $rdir(key) - return the direction of the request within dialog - $rdir(id) - returns integer 1 for downstream and 2 for upstream - $rdir(name) - returns the strings 'downstream' or 'upstream' - it requires append_fromtag to be set for rr module and has to be used after loose_route() --- Modified: modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d9ef80e8123bec0ebf09b5ce464a982… Patch: https://github.com/kamailio/kamailio/commit/d9ef80e8123bec0ebf09b5ce464a982… --- diff --git a/modules/rr/rr_mod.c b/modules/rr/rr_mod.c index 67eb905..06aec93 100644 --- a/modules/rr/rr_mod.c +++ b/modules/rr/rr_mod.c @@ -83,6 +83,9 @@ static int pv_get_from_tag_initial(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_get_to_tag_initial(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_get_rdir(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_rdir_name(pv_spec_p sp, str *in); + /*! * \brief Exported functions */ @@ -138,6 +141,9 @@ static pv_export_t mod_pvs[] = { PVT_OTHER, pv_get_from_tag_initial, 0, 0, 0, 0, 0}, {{"tti", (sizeof("tti")-1)}, /* To-Tag as for response to initial request */ PVT_OTHER, pv_get_to_tag_initial, 0, 0, 0, 0, 0}, + { {"rdir", (sizeof("rdir")-1)}, PVT_OTHER, pv_get_rdir, 0, + pv_parse_rdir_name, 0, 0, 0 }, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -489,6 +495,9 @@ static int remove_record_route(sip_msg_t* _m, char* _s1, char* _s2) return 1; } +/** + * + */ static int pv_get_to_tag_initial(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { @@ -525,6 +534,9 @@ static int pv_get_to_tag_initial(sip_msg_t *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &xto->tag_value); } +/** + * + */ static int pv_get_from_tag_initial(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { @@ -560,3 +572,63 @@ static int pv_get_from_tag_initial(sip_msg_t *msg, pv_param_t *param, } return pv_get_strval(msg, param, res, &xto->tag_value); } + +/** + * + */ +static int pv_parse_rdir_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 2: + if(strncmp(in->s, "id", 2)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else goto error; + break; + case 4: + if(strncmp(in->s, "name", 4)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV af key: %.*s\n", in->len, in->s); + return -1; +} + +static str pv_rr_flow_list[] = { + { "downstream", 10 }, + { "upstream", 8 }, + { 0, 0 } + }; + +/** + * + */ +static int pv_get_rdir(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + if(msg==NULL || param==NULL) + return -1; + + switch(param->pvn.u.isname.name.n) + { + case 1: + if(is_direction(msg, RR_FLOW_UPSTREAM)==0) + return pv_get_strval(msg, param, res, &pv_rr_flow_list[1]); + return pv_get_strval(msg, param, res, &pv_rr_flow_list[0]); + default: + if(is_direction(msg, RR_FLOW_UPSTREAM)==0) + return pv_get_uintval(msg, param, res, RR_FLOW_UPSTREAM); + return pv_get_uintval(msg, param, res, RR_FLOW_DOWNSTREAM); + } +}

1 0

git:master:5f98fddd: rr: new config variables $fti and $tti
by Daniel-Constantin Mierla 10 Mar '15

10 Mar '15

Module: kamailio Branch: master Commit: 5f98fddd971a28dbc2f29d19337a1645e869f69a URL: https://github.com/kamailio/kamailio/commit/5f98fddd971a28dbc2f29d19337a164… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-10T09:48:15+01:00 rr: new config variables $fti and $tti - $fti - from tag as in initial INVITE - $tti - to tag as in the response to the initial INVITE - requires append_fromtag to be set in order to detect the direction for requests within dialog --- Modified: modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5f98fddd971a28dbc2f29d19337a164… Patch: https://github.com/kamailio/kamailio/commit/5f98fddd971a28dbc2f29d19337a164… --- diff --git a/modules/rr/rr_mod.c b/modules/rr/rr_mod.c index 9147abe..67eb905 100644 --- a/modules/rr/rr_mod.c +++ b/modules/rr/rr_mod.c @@ -38,6 +38,8 @@ #include "../../mem/mem.h" #include "../../mod_fix.h" #include "../../parser/parse_rr.h" +#include "../../parser/parse_from.h" +#include "../../parser/parse_to.h" #include "../outbound/api.h" #include "loose.h" #include "record.h" @@ -77,6 +79,10 @@ static int w_is_direction(struct sip_msg *,char *, char *); static int remove_record_route(sip_msg_t*, char*, char*); /* PV functions */ static int pv_get_route_uri_f(struct sip_msg *, pv_param_t *, pv_value_t *); +static int pv_get_from_tag_initial(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); +static int pv_get_to_tag_initial(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); /*! * \brief Exported functions */ @@ -127,7 +133,11 @@ static param_export_t params[] ={ */ static pv_export_t mod_pvs[] = { {{"route_uri", (sizeof("route_uri")-1)}, /* URI of the first Route-Header */ - PVT_OTHER, pv_get_route_uri_f, 0, 0, 0, 0, 0}, + PVT_OTHER, pv_get_route_uri_f, 0, 0, 0, 0, 0}, + {{"fti", (sizeof("fti")-1)}, /* From-Tag as for initial request */ + PVT_OTHER, pv_get_from_tag_initial, 0, 0, 0, 0, 0}, + {{"tti", (sizeof("tti")-1)}, /* To-Tag as for response to initial request */ + PVT_OTHER, pv_get_to_tag_initial, 0, 0, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -478,3 +488,75 @@ static int remove_record_route(sip_msg_t* _m, char* _s1, char* _s2) free_rr_lump(&(_m->add_rm)); return 1; } + +static int pv_get_to_tag_initial(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res) +{ + struct to_body *xto; + if(msg==NULL) + return -1; + + if(msg->to==NULL && parse_headers(msg, HDR_TO_F, 0)==-1) { + LM_ERR("cannot parse To header\n"); + return pv_get_null(msg, param, res); + } + if(msg->to==NULL || get_to(msg)==NULL) { + LM_DBG("no To header\n"); + return pv_get_null(msg, param, res); + } + xto = get_to(msg); + + if(is_direction(msg, RR_FLOW_UPSTREAM)==0) { + if(parse_from_header(msg)<0) { + LM_ERR("cannot parse From header\n"); + return pv_get_null(msg, param, res); + } + if(msg->from==NULL || get_from(msg)==NULL) { + LM_DBG("no From header\n"); + return pv_get_null(msg, param, res); + } + xto = get_from(msg); + } + + if (xto->tag_value.s==NULL || xto->tag_value.len<=0) { + LM_DBG("no Tag parameter\n"); + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &xto->tag_value); +} + +static int pv_get_from_tag_initial(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res) +{ + struct to_body *xto; + if(msg==NULL) + return -1; + + if(parse_from_header(msg)<0) { + LM_ERR("cannot parse From header\n"); + return pv_get_null(msg, param, res); + } + if(msg->from==NULL || get_from(msg)==NULL) { + LM_DBG("no From header\n"); + return pv_get_null(msg, param, res); + } + xto = get_from(msg); + + if(is_direction(msg, RR_FLOW_UPSTREAM)==0) { + if(msg->to==NULL && parse_headers(msg, HDR_TO_F, 0)==-1) { + LM_ERR("cannot parse To header\n"); + return pv_get_null(msg, param, res); + } + if(msg->to==NULL || get_to(msg)==NULL) { + LM_DBG("no To header\n"); + return pv_get_null(msg, param, res); + } + xto = get_to(msg); + } + + if (xto->tag_value.s==NULL || xto->tag_value.len<=0) { + LM_DBG("no Tag parameter\n"); + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &xto->tag_value); +}

1 0

git:4.2:7e0e8ee8: kazoo: consumer unallocated structure prevents kazoo from starting on busy systems
by Luis Azedo 10 Mar '15

10 Mar '15

Module: kamailio Branch: 4.2 Commit: 7e0e8ee8e0753590e00445094b12bcefcf24605d URL: https://github.com/kamailio/kamailio/commit/7e0e8ee8e0753590e00445094b12bce… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-03-10T08:23:11Z kazoo: consumer unallocated structure prevents kazoo from starting on busy systems when kamailio starts, publisher begins to process without checking memory allocation initialized by consumer allocate bind structure once at initialization change the order of child process initialization change targeted binding (cherry picked from commit 6e1b56cb6d640db820254b8c69f7fd6e20865465) --- Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/7e0e8ee8e0753590e00445094b12bce… Patch: https://github.com/kamailio/kamailio/commit/7e0e8ee8e0753590e00445094b12bce…

1 0

git:master:6e1b56cb: kazoo: consumer unallocated structure prevents kazoo from starting on busy systems
by Luis Azedo 10 Mar '15

10 Mar '15

Module: kamailio Branch: master Commit: 6e1b56cb6d640db820254b8c69f7fd6e20865465 URL: https://github.com/kamailio/kamailio/commit/6e1b56cb6d640db820254b8c69f7fd6… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-03-10T08:22:05Z kazoo: consumer unallocated structure prevents kazoo from starting on busy systems when kamailio starts, publisher begins to process without checking memory allocation initialized by consumer allocate bind structure once at initialization change the order of child process initialization change targeted binding --- Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/6e1b56cb6d640db820254b8c69f7fd6… Patch: https://github.com/kamailio/kamailio/commit/6e1b56cb6d640db820254b8c69f7fd6…

1 0

Announcing rtpproxy v2.0.0
by Maxim Sobolev 09 Mar '15

09 Mar '15

Hi All, I'm happy to announce that we have released rtpproxy v2.0.0. You can review the release notes here: https://github.com/sippy/rtpproxy/releases/tag/v2.0.0 -sobomax

1 0

Errored: kamailio/kamailio#450 (master - deb0e81)
by Travis CI 09 Mar '15

09 Mar '15

Build Update for kamailio/kamailio ------------------------------------- Build: #450 Status: Errored Duration: 17 minutes and 49 seconds Commit: deb0e81 (master) Author: Luis Azedo Message: kazoo: only create tags if not empty to-tag and from-tag are created empty if not supplied in amp payload this patch formats the dialog message to include the tags only if they are supplied in amp payload View the changeset: https://github.com/kamailio/kamailio/compare/0f5aaac47a60...deb0e811cddd View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/53642886 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

git:4.2:4e1a1007: kazoo: only create tags if not empty
by Luis Azedo 09 Mar '15

09 Mar '15

Module: kamailio Branch: 4.2 Commit: 4e1a1007db5441849bc3c45a1b768e6a69b79c8f URL: https://github.com/kamailio/kamailio/commit/4e1a1007db5441849bc3c45a1b768e6… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-03-09T12:48:21Z kazoo: only create tags if not empty to-tag and from-tag are created empty if not supplied in amp payload this patch formats the dialog message to include the tags only if they are supplied in amp payload (cherry picked from commit deb0e811cddd71c45ebb36db7b41faa8d9e9ca5e) --- Modified: modules/kazoo/defs.h Modified: modules/kazoo/kz_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/4e1a1007db5441849bc3c45a1b768e6… Patch: https://github.com/kamailio/kamailio/commit/4e1a1007db5441849bc3c45a1b768e6… --- diff --git a/modules/kazoo/defs.h b/modules/kazoo/defs.h index 01d9af4..e7f991d 100644 --- a/modules/kazoo/defs.h +++ b/modules/kazoo/defs.h @@ -69,14 +69,17 @@ #define DIALOGINFO_EMPTY_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\"> \ -<dialog direction=\"initiator\">\ +<dialog call-id=\"76001e23e09704ea9e1257ebea85e1f3\" direction=\"initiator\">\ <state>terminated</state>\ </dialog>\ </dialog-info>" +#define LOCAL_TAG "local-tag=\"%.*s\"" +#define REMOTE_TAG "remote-tag=\"%.*s\"" + #define DIALOGINFO_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\">\ -<dialog id=\"%.*s\" call-id=\"%.*s\" local-tag=\"%.*s\" remote-tag=\"%.*s\" direction=\"%.*s\">\ +<dialog id=\"%.*s\" call-id=\"%.*s\" %.*s %.*s direction=\"%.*s\">\ <state>%.*s</state>\ <local>\ <identity display=\"%.*s\">%.*s</identity>\ @@ -91,7 +94,7 @@ #define DIALOGINFO_BODY_2 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\">\ -<dialog id=\"%.*s\" call-id=\"%.*s\" local-tag=\"%.*s\" remote-tag=\"%.*s\" direction=\"%.*s\">\ +<dialog id=\"%.*s\" call-id=\"%.*s\" %.*s %.*s direction=\"%.*s\">\ <state>%.*s</state>\ <local>\ <identity display=\"%.*s\">%.*s</identity>\ diff --git a/modules/kazoo/kz_pua.c b/modules/kazoo/kz_pua.c index 562a060..d9757a7 100644 --- a/modules/kazoo/kz_pua.c +++ b/modules/kazoo/kz_pua.c @@ -320,6 +320,8 @@ int kz_pua_publish_dialoginfo_to_presentity(struct json_object *json_obj) { int expires = 0; str event = str_init("dialog"); int reset = 0; + char to_tag_buffer[100]; + char from_tag_buffer[100]; char *body = (char *)pkg_malloc(DIALOGINFO_BODY_BUFFER_SIZE); if(body == NULL) { @@ -375,6 +377,16 @@ int kz_pua_publish_dialoginfo_to_presentity(struct json_object *json_obj) { if(!to_uri.len) to_uri = to; + if(fromtag.len > 0) { + fromtag.len = sprintf(from_tag_buffer, LOCAL_TAG, fromtag.len, fromtag.s); + fromtag.s = from_tag_buffer; + } + + if(totag.len > 0) { + totag.len = sprintf(to_tag_buffer, REMOTE_TAG, totag.len, totag.s); + totag.s = to_tag_buffer; + } + if(callid.len) { if(dbk_include_entity) {

1 0

git:master:deb0e811: kazoo: only create tags if not empty
by Luis Azedo 09 Mar '15

09 Mar '15

Module: kamailio Branch: master Commit: deb0e811cddd71c45ebb36db7b41faa8d9e9ca5e URL: https://github.com/kamailio/kamailio/commit/deb0e811cddd71c45ebb36db7b41faa… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-03-09T12:47:31Z kazoo: only create tags if not empty to-tag and from-tag are created empty if not supplied in amp payload this patch formats the dialog message to include the tags only if they are supplied in amp payload --- Modified: modules/kazoo/defs.h Modified: modules/kazoo/kz_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/deb0e811cddd71c45ebb36db7b41faa… Patch: https://github.com/kamailio/kamailio/commit/deb0e811cddd71c45ebb36db7b41faa… --- diff --git a/modules/kazoo/defs.h b/modules/kazoo/defs.h index 01d9af4..e7f991d 100644 --- a/modules/kazoo/defs.h +++ b/modules/kazoo/defs.h @@ -69,14 +69,17 @@ #define DIALOGINFO_EMPTY_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\"> \ -<dialog direction=\"initiator\">\ +<dialog call-id=\"76001e23e09704ea9e1257ebea85e1f3\" direction=\"initiator\">\ <state>terminated</state>\ </dialog>\ </dialog-info>" +#define LOCAL_TAG "local-tag=\"%.*s\"" +#define REMOTE_TAG "remote-tag=\"%.*s\"" + #define DIALOGINFO_BODY "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\">\ -<dialog id=\"%.*s\" call-id=\"%.*s\" local-tag=\"%.*s\" remote-tag=\"%.*s\" direction=\"%.*s\">\ +<dialog id=\"%.*s\" call-id=\"%.*s\" %.*s %.*s direction=\"%.*s\">\ <state>%.*s</state>\ <local>\ <identity display=\"%.*s\">%.*s</identity>\ @@ -91,7 +94,7 @@ #define DIALOGINFO_BODY_2 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\ <dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"1\" state=\"full\" entity=\"%.*s\">\ -<dialog id=\"%.*s\" call-id=\"%.*s\" local-tag=\"%.*s\" remote-tag=\"%.*s\" direction=\"%.*s\">\ +<dialog id=\"%.*s\" call-id=\"%.*s\" %.*s %.*s direction=\"%.*s\">\ <state>%.*s</state>\ <local>\ <identity display=\"%.*s\">%.*s</identity>\ diff --git a/modules/kazoo/kz_pua.c b/modules/kazoo/kz_pua.c index 562a060..d9757a7 100644 --- a/modules/kazoo/kz_pua.c +++ b/modules/kazoo/kz_pua.c @@ -320,6 +320,8 @@ int kz_pua_publish_dialoginfo_to_presentity(struct json_object *json_obj) { int expires = 0; str event = str_init("dialog"); int reset = 0; + char to_tag_buffer[100]; + char from_tag_buffer[100]; char *body = (char *)pkg_malloc(DIALOGINFO_BODY_BUFFER_SIZE); if(body == NULL) { @@ -375,6 +377,16 @@ int kz_pua_publish_dialoginfo_to_presentity(struct json_object *json_obj) { if(!to_uri.len) to_uri = to; + if(fromtag.len > 0) { + fromtag.len = sprintf(from_tag_buffer, LOCAL_TAG, fromtag.len, fromtag.s); + fromtag.s = from_tag_buffer; + } + + if(totag.len > 0) { + totag.len = sprintf(to_tag_buffer, REMOTE_TAG, totag.len, totag.s); + totag.s = to_tag_buffer; + } + if(callid.len) { if(dbk_include_entity) {

1 0

rtpengine trust-address
by Juha Heinanen 09 Mar '15

09 Mar '15

rtpengine 3.3.0.0+0~mr3.8.0.0 debian changelog lists: * make "trust address" the default behaviour this is also reflected in README.md: trust address The opposite of SIP source address. This is the default behaviour unless the CLI switch --sip-source is active. master version of kamailio rtpengine readme, however, still has this: + trust-address - flags that IP address in SDP should be trusted. Without this flag, the RTP proxy ignores address in the SDP and uses source address of the SIP message as media address which is passed to the RTP proxy. what version of rtpengine is kamailio master rtpengine module compatible with? should it be stated in the readme? -- juha

2 1

git:4.2:7140f86b: textops: stop after substituting in first header if flag f is set for subst_hf()
by Daniel-Constantin Mierla 09 Mar '15

09 Mar '15

Module: kamailio Branch: 4.2 Commit: 7140f86bc020ef60d2b35b79e9d051a415372036 URL: https://github.com/kamailio/kamailio/commit/7140f86bc020ef60d2b35b79e9d051a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-03-09T12:38:53+01:00 textops: stop after substituting in first header if flag f is set for subst_hf() - reported by Julia Boudniatsky (cherry picked from commit 0f5aaac47a6002bbd4fdfaf0e6897d307c2cbc0e) --- Modified: modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/7140f86bc020ef60d2b35b79e9d051a… Patch: https://github.com/kamailio/kamailio/commit/7140f86bc020ef60d2b35b79e9d051a… --- diff --git a/modules/textops/textops.c b/modules/textops/textops.c index 8e9bcb7..50a6f07 100644 --- a/modules/textops/textops.c +++ b/modules/textops/textops.c @@ -2889,6 +2889,9 @@ static int subst_hf_f(struct sip_msg *msg, char *str_hf, char *subst, char *flag } else { hfl = hf; } + /* if flags set for first header, then all done */ + if(flags!=NULL && *flags=='f') + return ret; } if(hfl!=NULL) {

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2015