sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:master:0bded933: call_obj: module to track calls and its duration by using ascending integers.
by Vicente Hernando 29 Mar '17

29 Mar '17

Module: kamailio Branch: master Commit: 0bded933d8ff9e533d426dc205dd5db385bfaf53 URL: https://github.com/kamailio/kamailio/commit/0bded933d8ff9e533d426dc205dd5db… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2017-03-29T14:26:37+02:00 call_obj: module to track calls and its duration by using ascending integers. --- Added: src/modules/call_obj/Makefile Added: src/modules/call_obj/README Added: src/modules/call_obj/call_obj_mod.c Added: src/modules/call_obj/cobj.c Added: src/modules/call_obj/cobj.h Added: src/modules/call_obj/doc/Makefile Added: src/modules/call_obj/doc/call_obj.xml Added: src/modules/call_obj/doc/call_obj_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0bded933d8ff9e533d426dc205dd5db… Patch: https://github.com/kamailio/kamailio/commit/0bded933d8ff9e533d426dc205dd5db…

1 0

git:master:d8fa1ae3: pv: new variable - $hdrc(HName)
by Daniel-Constantin Mierla 29 Mar '17

29 Mar '17

Module: kamailio Branch: master Commit: d8fa1ae396305f6f05607f5bc0914913adc6bf7d URL: https://github.com/kamailio/kamailio/commit/d8fa1ae396305f6f05607f5bc091491… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-29T12:41:41+02:00 pv: new variable - $hdrc(HName) - return the number of headers matching the name with HName - e.g., $hdrc(Via) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/d8fa1ae396305f6f05607f5bc091491… Patch: https://github.com/kamailio/kamailio/commit/d8fa1ae396305f6f05607f5bc091491… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index f1e1f41..4d0df10 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -97,6 +97,8 @@ static pv_export_t mod_pvs[] = { pv_parse_avp_name, pv_parse_index, 0, 0}, {{"hdr", (sizeof("hdr")-1)}, PVT_HDR, pv_get_hdr, 0, pv_parse_hdr_name, pv_parse_index, 0, 0}, + {{"hdrc", (sizeof("hdrc")-1)}, PVT_HDRC, pv_get_hdrc, 0, pv_parse_hdr_name, + 0, 0, 0}, {{"var", (sizeof("var")-1)}, PVT_SCRIPTVAR, pv_get_scriptvar, pv_set_scriptvar, pv_parse_scriptvar_name, 0, 0, 0}, {{"vz", (sizeof("vz")-1)}, PVT_SCRIPTVAR, pv_get_scriptvar, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index f1d264b..40a9952 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1797,6 +1797,70 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) } +/** + * + */ +int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +{ + int idx; + int idxf; + pv_value_t tv; + struct hdr_field *hf; + struct hdr_field *hf0; + char *p, *p_ini; + int n, p_size; + int hcount; + + if(msg==NULL || res==NULL || param==NULL) + return -1; + + hcount = 0; + + /* get the name */ + if(param->pvn.type == PV_NAME_PVAR) + { + if(pv_get_spec_name(msg, param, &tv)!=0 || (!(tv.flags&PV_VAL_STR))) + { + LM_ERR("invalid name\n"); + return pv_get_sintval(msg, param, res, hcount); + } + } else { + if(param->pvn.u.isname.type == AVP_NAME_STR) + { + tv.flags = PV_VAL_STR; + tv.rs = param->pvn.u.isname.name.s; + } else { + tv.flags = 0; + tv.ri = param->pvn.u.isname.name.n; + } + } + /* we need to be sure we have parsed all headers */ + if(parse_headers(msg, HDR_EOH_F, 0)<0) + { + LM_ERR("error parsing headers\n"); + return pv_get_sintval(msg, param, res, hcount); + } + + + for (hf=msg->headers; hf; hf=hf->next) + { + if(tv.flags == 0) + { + if (tv.ri==hf->type) { + hcount++; + } + } else { + if (cmp_hdrname_str(&hf->name, &tv.rs)==0) { + hcount++; + } + } + } + return pv_get_sintval(msg, param, res, hcount); +} + +/** + * + */ int pv_get_scriptvar(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 27c13bb..98e6b56 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -28,10 +28,10 @@ int pv_get_msgid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); -int pv_get_udp(struct sip_msg *msg, pv_param_t *param, +int pv_get_udp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); -int pv_get_5060(struct sip_msg *msg, pv_param_t *param, +int pv_get_5060(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_return_code(struct sip_msg *msg, pv_param_t *param, @@ -203,6 +203,8 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + int pv_get_scriptvar(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:2d9a016e: core: new pv type for header count
by Daniel-Constantin Mierla 29 Mar '17

29 Mar '17

Module: kamailio Branch: master Commit: 2d9a016ede219c2f2731e09ca45281d8ef711d50 URL: https://github.com/kamailio/kamailio/commit/2d9a016ede219c2f2731e09ca45281d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-29T12:41:16+02:00 core: new pv type for header count --- Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/2d9a016ede219c2f2731e09ca45281d… Patch: https://github.com/kamailio/kamailio/commit/2d9a016ede219c2f2731e09ca45281d… --- diff --git a/src/core/pvar.h b/src/core/pvar.h index 68955ad..b82198d 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -77,7 +77,8 @@ enum _pv_type { PVT_DSTURI, PVT_COLOR, PVT_BRANCH, PVT_FROM, PVT_TO, PVT_OURI, PVT_SCRIPTVAR, PVT_MSG_BODY, PVT_CONTEXT, - PVT_XAVP, PVT_OTHER, PVT_EXTRA /* keep it last */ + PVT_XAVP, PVT_HDRC, PVT_OTHER, + PVT_EXTRA /* keep it last */ }; typedef enum _pv_type pv_type_t;

1 0

git:master:666ebb63: dmq: attempt to re-initialize if node becomes detatched from cluster
by Charles Chance 28 Mar '17

28 Mar '17

Module: kamailio Branch: master Commit: 666ebb63aecf2254b8efeae261452fc75c6d3aed URL: https://github.com/kamailio/kamailio/commit/666ebb63aecf2254b8efeae261452fc… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-03-28T21:28:35+01:00 dmq: attempt to re-initialize if node becomes detatched from cluster - issue reported by JosÃ© Seabra on sr-users mailing list --- Modified: src/modules/dmq/dmq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/666ebb63aecf2254b8efeae261452fc… Patch: https://github.com/kamailio/kamailio/commit/666ebb63aecf2254b8efeae261452fc… --- diff --git a/src/modules/dmq/dmq_funcs.c b/src/modules/dmq/dmq_funcs.c index 57c8c88..622ec42 100644 --- a/src/modules/dmq/dmq_funcs.c +++ b/src/modules/dmq/dmq_funcs.c @@ -459,12 +459,28 @@ void ping_servers(unsigned int ticks, void *param) { str* body; int ret; LM_DBG("ping_servers\n"); + + if (!node_list->nodes || (node_list->nodes->local && !node_list->nodes->next)) { + LM_DBG("node list is empty - attempt to rebuild from notification address\n"); + *dmq_init_callback_done = 0; + if(dmq_notification_address.s) { + notification_node = add_server_and_notify(&dmq_notification_address); + if(!notification_node) { + LM_ERR("cannot retrieve initial nodelist from %.*s\n", + STR_FMT(&dmq_notification_address)); + } + } else { + LM_ERR("no notification address"); + } + return; + } + body = build_notification_body(); if (!body) { LM_ERR("could not build notification body\n"); return; } - ret = bcast_dmq_message(dmq_notification_peer, body, notification_node, + ret = bcast_dmq_message(dmq_notification_peer, body, NULL, &notification_callback, 1, &notification_content_type); pkg_free(body->s); pkg_free(body);

1 0

git:master:52471366: pkg/kamailio/deb: version set to 5.1.0-dev2
by Victor Seva 28 Mar '17

28 Mar '17

Module: kamailio Branch: master Commit: 52471366d34419fbd4a70eff93420157a532bf09 URL: https://github.com/kamailio/kamailio/commit/52471366d34419fbd4a70eff9342015… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-03-28T17:01:16+02:00 pkg/kamailio/deb: version set to 5.1.0-dev2 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/52471366d34419fbd4a70eff9342015… Patch: https://github.com/kamailio/kamailio/commit/52471366d34419fbd4a70eff9342015… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index c962953..00eaba6 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev2) unstable; urgency=medium + + * version set to 5.1.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Tue, 28 Mar 2017 17:00:21 +0200 + kamailio (5.1.0~dev1) unstable; urgency=medium * version set to 5.1.0-dev1 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index c962953..00eaba6 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev2) unstable; urgency=medium + + * version set to 5.1.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Tue, 28 Mar 2017 17:00:21 +0200 + kamailio (5.1.0~dev1) unstable; urgency=medium * version set to 5.1.0-dev1 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index c962953..00eaba6 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev2) unstable; urgency=medium + + * version set to 5.1.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Tue, 28 Mar 2017 17:00:21 +0200 + kamailio (5.1.0~dev1) unstable; urgency=medium * version set to 5.1.0-dev1 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index c962953..00eaba6 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev2) unstable; urgency=medium + + * version set to 5.1.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Tue, 28 Mar 2017 17:00:21 +0200 + kamailio (5.1.0~dev1) unstable; urgency=medium * version set to 5.1.0-dev1 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index c962953..00eaba6 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev2) unstable; urgency=medium + + * version set to 5.1.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Tue, 28 Mar 2017 17:00:21 +0200 + kamailio (5.1.0~dev1) unstable; urgency=medium * version set to 5.1.0-dev1 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index c962953..00eaba6 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev2) unstable; urgency=medium + + * version set to 5.1.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Tue, 28 Mar 2017 17:00:21 +0200 + kamailio (5.1.0~dev1) unstable; urgency=medium * version set to 5.1.0-dev1 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index c962953..00eaba6 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev2) unstable; urgency=medium + + * version set to 5.1.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Tue, 28 Mar 2017 17:00:21 +0200 + kamailio (5.1.0~dev1) unstable; urgency=medium * version set to 5.1.0-dev1 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index c962953..00eaba6 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.0~dev2) unstable; urgency=medium + + * version set to 5.1.0-dev2 + + -- Victor Seva <vseva(a)debian.org> Tue, 28 Mar 2017 17:00:21 +0200 + kamailio (5.1.0~dev1) unstable; urgency=medium * version set to 5.1.0-dev1

1 0

git:4.4:98729f05: pv: proper evaluation of pv param for param.count transformation
by Daniel-Constantin Mierla 28 Mar '17

28 Mar '17

Module: kamailio Branch: 4.4 Commit: 98729f05a8e1b9b7edb1a1009075fc4a7bfcfd0a URL: https://github.com/kamailio/kamailio/commit/98729f05a8e1b9b7edb1a1009075fc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-28T16:03:32+02:00 pv: proper evaluation of pv param for param.count transformation - reported by GH #1041 (cherry picked from commit 964557553fd39fca1de35cf7d2f9e64134da7495) (cherry picked from commit 26080154471b41198b1bd1df40fe5f1a0f461c8c) --- Modified: modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/98729f05a8e1b9b7edb1a1009075fc4… Patch: https://github.com/kamailio/kamailio/commit/98729f05a8e1b9b7edb1a1009075fc4… --- diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index dfccc75..aefa0e6 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -1259,6 +1259,7 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t *val) { pv_value_t v; + pv_value_t vs; str sv; int n, i; char separator = ';'; @@ -1272,17 +1273,23 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, { if (subtype == TR_PL_COUNT) { - if(tp->type != TR_PARAM_STRING || tp->v.s.len != 1) - return -1; - - separator = tp->v.s.s[0]; - } - else if (tp->next != NULL) - { + if(tp->type != TR_PARAM_STRING) { + if(pv_get_spec_value(msg, (pv_spec_t*)tp->v.data, &vs)!=0 + || (!(vs.flags&PV_VAL_STR)) || vs.rs.len<=0) + { + LM_ERR("value cannot get p1\n"); + return -1; + } + separator = vs.rs.s[0]; + } else { + if(tp->v.s.len != 1) + return -1; + separator = tp->v.s.s[0]; + } + } else if (tp->next != NULL) { if(tp->next->type != TR_PARAM_STRING || tp->next->v.s.len != 1) return -1; - separator = tp->next->v.s.s[0]; } }

1 0

git:master:406dc903: modules/sipt.c: fix compiler warnings
by Torrey Searle 28 Mar '17

28 Mar '17

Module: kamailio Branch: master Commit: 406dc9039035dd238ab4f3a3fd04148da8b588a1 URL: https://github.com/kamailio/kamailio/commit/406dc9039035dd238ab4f3a3fd04148… Author: Torrey Searle <torrey(a)voxbone.com> Committer: Torrey Searle <torrey(a)voxbone.com> Date: 2017-03-28T16:02:36+02:00 modules/sipt.c: fix compiler warnings --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/406dc9039035dd238ab4f3a3fd04148… Patch: https://github.com/kamailio/kamailio/commit/406dc9039035dd238ab4f3a3fd04148… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index 9825b68..d583ca0 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -575,7 +575,7 @@ static int sipt_set_bci_1(struct sip_msg *msg, char *_charge_indicator, char *_c static int sipt_destination(struct sip_msg *msg, char *_destination, char *_hops, char * _nai) { str terminator = str_init("1"); - sipt_destination2(msg, _destination, _hops, _nai, &terminator); + return sipt_destination2(msg, _destination, _hops, _nai, (char*)&terminator); } static int sipt_destination2(struct sip_msg *msg, char *_destination, char *_hops, char * _nai, char * _terminator)

1 0

git:5.0:26080154: pv: proper evaluation of pv param for param.count transformation
by Daniel-Constantin Mierla 28 Mar '17

28 Mar '17

Module: kamailio Branch: 5.0 Commit: 26080154471b41198b1bd1df40fe5f1a0f461c8c URL: https://github.com/kamailio/kamailio/commit/26080154471b41198b1bd1df40fe5f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-28T16:02:27+02:00 pv: proper evaluation of pv param for param.count transformation - reported by GH #1041 (cherry picked from commit 964557553fd39fca1de35cf7d2f9e64134da7495) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/26080154471b41198b1bd1df40fe5f1… Patch: https://github.com/kamailio/kamailio/commit/26080154471b41198b1bd1df40fe5f1… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f15975e..6ad9a97 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1294,6 +1294,7 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t *val) { pv_value_t v; + pv_value_t vs; str sv; int n, i; char separator = ';'; @@ -1307,17 +1308,23 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, { if (subtype == TR_PL_COUNT) { - if(tp->type != TR_PARAM_STRING || tp->v.s.len != 1) - return -1; - - separator = tp->v.s.s[0]; - } - else if (tp->next != NULL) - { + if(tp->type != TR_PARAM_STRING) { + if(pv_get_spec_value(msg, (pv_spec_t*)tp->v.data, &vs)!=0 + || (!(vs.flags&PV_VAL_STR)) || vs.rs.len<=0) + { + LM_ERR("value cannot get p1\n"); + return -1; + } + separator = vs.rs.s[0]; + } else { + if(tp->v.s.len != 1) + return -1; + separator = tp->v.s.s[0]; + } + } else if (tp->next != NULL) { if(tp->next->type != TR_PARAM_STRING || tp->next->v.s.len != 1) return -1; - separator = tp->next->v.s.s[0]; } }

1 0

git:master:96455755: pv: proper evaluation of pv param for param.count transformation
by Daniel-Constantin Mierla 28 Mar '17

28 Mar '17

Module: kamailio Branch: master Commit: 964557553fd39fca1de35cf7d2f9e64134da7495 URL: https://github.com/kamailio/kamailio/commit/964557553fd39fca1de35cf7d2f9e64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-28T15:59:50+02:00 pv: proper evaluation of pv param for param.count transformation - reported by GH #1041 --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/964557553fd39fca1de35cf7d2f9e64… Patch: https://github.com/kamailio/kamailio/commit/964557553fd39fca1de35cf7d2f9e64… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f15975e..6ad9a97 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1294,6 +1294,7 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t *val) { pv_value_t v; + pv_value_t vs; str sv; int n, i; char separator = ';'; @@ -1307,17 +1308,23 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, { if (subtype == TR_PL_COUNT) { - if(tp->type != TR_PARAM_STRING || tp->v.s.len != 1) - return -1; - - separator = tp->v.s.s[0]; - } - else if (tp->next != NULL) - { + if(tp->type != TR_PARAM_STRING) { + if(pv_get_spec_value(msg, (pv_spec_t*)tp->v.data, &vs)!=0 + || (!(vs.flags&PV_VAL_STR)) || vs.rs.len<=0) + { + LM_ERR("value cannot get p1\n"); + return -1; + } + separator = vs.rs.s[0]; + } else { + if(tp->v.s.len != 1) + return -1; + separator = tp->v.s.s[0]; + } + } else if (tp->next != NULL) { if(tp->next->type != TR_PARAM_STRING || tp->next->v.s.len != 1) return -1; - separator = tp->next->v.s.s[0]; } }

1 0

git:master:e4ee924b: modules/sipt: make the digit terminator optional on set_destination
by Torrey Searle 28 Mar '17

28 Mar '17

Module: kamailio Branch: master Commit: e4ee924b4919b3efd853c38506a3d2934797eaaa URL: https://github.com/kamailio/kamailio/commit/e4ee924b4919b3efd853c38506a3d29… Author: Torrey Searle <torrey(a)voxbone.com> Committer: Torrey Searle <torrey(a)voxbone.com> Date: 2017-03-28T15:53:14+02:00 modules/sipt: make the digit terminator optional on set_destination --- Modified: src/modules/sipt/doc/sipt_admin.xml Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/e4ee924b4919b3efd853c38506a3d29… Patch: https://github.com/kamailio/kamailio/commit/e4ee924b4919b3efd853c38506a3d29… --- diff --git a/src/modules/sipt/doc/sipt_admin.xml b/src/modules/sipt/doc/sipt_admin.xml index ddd865d..1f0361b 100644 --- a/src/modules/sipt/doc/sipt_admin.xml +++ b/src/modules/sipt/doc/sipt_admin.xml @@ -38,11 +38,13 @@ <section> <title>Functions</title> <section id="sipt.f.sipt_destination"> - <title><function moreinfo="none">sipt_destination(destination, hops, nai)</function></title> + <title><function moreinfo="none">sipt_destination(destination, hops, nai[, terminator=1])</function></title> <para> updates the IAM in the body if it exists, setting the called party number to <quote>destination</quote> with the nature address specified in <quote>nai</quote> and decrementing the hop counter value if present. - If the hop counter header is missing it will be added with the value of <quote>hops</quote>. + If the hop counter header is missing it will be added with the value of <quote>hops</quote>. If + <quote>terminator</quote> is set to 1, then F will be appened to digit string to indicate the number + is complete (default). </para> <example> <title><function moreinfo="none">sipt_destination(destination, hops, nai)</function> usage</title> diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index 9045c77..9825b68 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -40,6 +40,7 @@ MODULE_VERSION static int sipt_set_bci_1(struct sip_msg *msg, char *_charge_indicator, char *_called_status, char * _called_category, char * _e2e_indicator); static int sipt_destination(struct sip_msg *msg, char *_destination, char *_hops, char * _nai); +static int sipt_destination2(struct sip_msg *msg, char *_destination, char *_hops, char * _nai, char * _terminator); static int sipt_set_calling(struct sip_msg *msg, char *_origin, char *_nai, char *_pres, char * _screen); static int sipt_get_hop_counter(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int sipt_get_event_info(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); @@ -132,6 +133,12 @@ static cmd_export_t cmds[]={ fixup_str_str_str, fixup_free_str_str_str, /* */ /* can be applied to original requests */ REQUEST_ROUTE|BRANCH_ROUTE}, + {"sipt_destination", /* action name as in scripts */ + (cmd_function)sipt_destination2, /* C function name */ + 4, /* number of parameters */ + fixup_str_str_str, fixup_free_str_str_str, /* */ + /* can be applied to original requests */ + REQUEST_ROUTE|BRANCH_ROUTE}, {"sipt_set_calling", /* action name as in scripts */ (cmd_function)sipt_set_calling, /* C function name */ 4, /* number of parameters */ @@ -566,7 +573,12 @@ static int sipt_set_bci_1(struct sip_msg *msg, char *_charge_indicator, char *_c return 1; } -static int sipt_destination(struct sip_msg *msg, char *_destination, char *_hops, char * _nai) +static int sipt_destination(struct sip_msg *msg, char *_destination, char *_hops, char * _nai) { + str terminator = str_init("1"); + sipt_destination2(msg, _destination, _hops, _nai, &terminator); +} + +static int sipt_destination2(struct sip_msg *msg, char *_destination, char *_hops, char * _nai, char * _terminator) { str * str_hops = (str*)_hops; unsigned int hops = 0; @@ -574,6 +586,9 @@ static int sipt_destination(struct sip_msg *msg, char *_destination, char *_hops str * nai = (str*)_nai; unsigned int int_nai = 0; str2int(nai, &int_nai); + str * terminator = (str*)_terminator; + unsigned int int_terminator; + str2int(terminator, &int_terminator); str * destination = (str*)_destination; struct sdp_mangler mangle; @@ -613,7 +628,10 @@ static int sipt_destination(struct sip_msg *msg, char *_destination, char *_hops char * digits = calloc(1,destination->len+2); memcpy(digits, destination->s, destination->len); - digits[destination->len] = '#'; + + if (int_terminator) { + digits[destination->len] = '#'; + } int res = isup_update_destination(&mangle, digits, hops, int_nai, (unsigned char*)body.s, body.len); free(digits);

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
27
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 2017