sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
313 discussions

git:master:356ee3ad: sl: new pv $ltt(key) - return local generated to tag
by Daniel-Constantin Mierla 04 Dec '18

04 Dec '18

Module: kamailio Branch: master Commit: 356ee3ad0c40d74fd95e5be1bfe3b311d7c7abeb URL: https://github.com/kamailio/kamailio/commit/356ee3ad0c40d74fd95e5be1bfe3b31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-04T09:21:38+01:00 sl: new pv $ltt(key) - return local generated to tag - the to-tag used when kamailio sends a reply - $ltt(s) - the to-tag used in stateless replies - $ltt(t) - the to-tag used … [View More]in transaction stateful replies (transaction has to be created at that time, eg., by t_newtran() or in a branch/failure route, otherwise it returns $null) - $ltt(x) - $ltt(t) if the transaction was created already, otherwise $ltt(s) --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/356ee3ad0c40d74fd95e5be1bfe3b31… Patch: https://github.com/kamailio/kamailio/commit/356ee3ad0c40d74fd95e5be1bfe3b31… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 96c3fdfdf5..36c8a8eec7 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -78,6 +78,17 @@ static int child_init(int rank); static void mod_destroy(); static int fixup_sl_reply(void** param, int param_no); +static int pv_get_ltt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int pv_parse_ltt_name(pv_spec_p sp, str *in); + + +static pv_export_t mod_pvs[] = { + { {"ltt", (sizeof("ltt")-1)}, PVT_OTHER, pv_get_ltt, 0, + pv_parse_ltt_name, 0, 0, 0 }, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + static cmd_export_t cmds[]={ {"sl_send_reply", w_sl_send_reply, 2, fixup_sl_reply, 0, REQUEST_ROUTE}, @@ -120,7 +131,7 @@ struct module_exports exports= { cmds, /* cmd (cfg function) exports */ params, /* param exports */ sl_rpc, /* RPC method exports */ - 0, /* pv exports */ + mod_pvs, /* pv exports */ 0, /* response handling function */ mod_init, /* module init function */ child_init, /* per-child init function */ @@ -485,6 +496,83 @@ static int w_sl_forward_reply2(sip_msg_t* msg, char* str1, char* str2) return w_sl_forward_reply(msg, &code, &reason); } +/** + * + */ +static int pv_get_ltt(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + str ttag = STR_NULL; + tm_cell_t *t = NULL; + + if(msg==NULL) + return pv_get_null(msg, param, res); + + if(param==NULL) + return pv_get_null(msg, param, res); + + switch(param->pvn.u.isname.name.n) { + case 0: /* mixed */ + if(get_reply_totag(msg, &ttag)<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &ttag); + case 1: /* stateless */ + if(sl_get_reply_totag(msg, &ttag)<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &ttag); + case 2: /* transaction stateful */ + if(sl_bind_tm==0 || tmb.t_gett==0) { + return pv_get_null(msg, param, res); + } + + t = tmb.t_gett(); + if(t== NULL || t==T_UNDEFINED) { + return pv_get_null(msg, param, res); + } + if(tmb.t_get_reply_totag(msg, &ttag)<0) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &ttag); + default: + return pv_get_null(msg, param, res); + } +} + +/** + * + */ +static int pv_parse_ltt_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) { + case 1: + if(strncmp(in->s, "x", 1)==0) { + sp->pvp.pvn.u.isname.name.n = 0; + } else if(strncmp(in->s, "s", 1)==0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else if(strncmp(in->s, "t", 1)==0) { + sp->pvp.pvn.u.isname.name.n = 2; + } 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 ltt key: %.*s\n", in->len, in->s); + return -1; +} + + /** * @brief bind functions to SL API structure */ [View Less]

2 1

git:5.2:07d99036: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 04 Dec '18

04 Dec '18

Module: kamailio Branch: 5.2 Commit: 07d990366365499ac1296f16efa56c540ad1dd40 URL: https://github.com/kamailio/kamailio/commit/07d990366365499ac1296f16efa56c5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-12-04T09:16:46+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/… [View More]kamailio/commit/07d990366365499ac1296f16efa56c5… Patch: https://github.com/kamailio/kamailio/commit/07d990366365499ac1296f16efa56c5… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index c90e631a94..53a464d8ff 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1439,12 +1439,21 @@ kamcmd dispatcher.ping_active 0 destination address (string value in full SIP URI format). Optionally, these fields can be followed by: - * flags (listed by index - can be bitwise mask of values): 0 (value - 1) - inactive destination; 1 (value 2) - temporary trying - destination (in the way to become inactive if it does not reply to - keepalives - there is a module parameter to set the threshold of - failures); 2 (value 4) - admin disabled destination; 3 (value 8) - - probing destination (sending keep alives); + * flags - control the mode of using the destination address and + sending keepalives. It is a bitwise value that can be built using + the folowing flags: + + 1 (bit at index 0 - 1 <<0) - inactive destination + + 2 (bit at index 1 - 1 <<1) - temporary trying destination (in + the way to become inactive if it does not reply to keepalives + - there is a module parameter to set the threshold of + failures) + + 4 (bit at index 2 - 1 <<2) - admin disabled destination + + 8 (bit at index 3 - 1 <<3) - probing destination (sending keep + alives); + + 16 (bit at index 4 - 1 <<4) - skip DNS A/AAAA resolve at + startup, useful when the hostname of the destination address + is a NAPTR or SRV record only. Such addresses cannot be + matched anymore with ds_is_from_list(...). * priority: sets the priority in destination list (based on it is done the initial ordering inside the set) * attributes: extra fields in form of name1=value1;...;nameN=valueN. diff --git a/src/modules/ims_charging/README b/src/modules/ims_charging/README index ec8dd1118b..d195743197 100644 --- a/src/modules/ims_charging/README +++ b/src/modules/ims_charging/README @@ -66,7 +66,7 @@ Carlos Ruiz Diaz 5. Functions 5.1. Ro_CCR(route_name, direction, reservation_units, - domain, incoming_trunk_id, outgoing_trunk_id + incoming_trunk_id, outgoing_trunk_id) 5.2. Ro_set_session_id_avp() @@ -163,8 +163,8 @@ Chapter 1. Admin Guide 5. Functions - 5.1. Ro_CCR(route_name, direction, reservation_units, domain, - incoming_trunk_id, outgoing_trunk_id + 5.1. Ro_CCR(route_name, direction, reservation_units, + incoming_trunk_id, outgoing_trunk_id) 5.2. Ro_set_session_id_avp() @@ -689,13 +689,13 @@ modparam("ims_charging", "custom_user_avp", "$avp(from_user)") 5. Functions - 5.1. Ro_CCR(route_name, direction, reservation_units, domain, - incoming_trunk_id, outgoing_trunk_id + 5.1. Ro_CCR(route_name, direction, reservation_units, + incoming_trunk_id, outgoing_trunk_id) 5.2. Ro_set_session_id_avp() -5.1. Ro_CCR(route_name, direction, reservation_units, domain, -incoming_trunk_id, outgoing_trunk_id +5.1. Ro_CCR(route_name, direction, reservation_units, incoming_trunk_id, +outgoing_trunk_id) Perform a CCR on Diameter Ro interface for Charging @@ -704,7 +704,6 @@ incoming_trunk_id, outgoing_trunk_id * direction "orig"inating or "term"inating * reservation_units how many units (at the moment seconds) should be reserved at the moment. - * domain Logical domain within registrar. * incoming_trunk_id Identifies the trunk group from which this originates. * outgoing_trunk_id Identifies the trunk group where this will be [View Less]

1 0

git:5.2:79946bbb: dialog: safety checks for local cseq and contact vars
by Daniel-Constantin Mierla 04 Dec '18

04 Dec '18

Module: kamailio Branch: 5.2 Commit: 79946bbb6d1731f503fc378ae38311b630e55999 URL: https://github.com/kamailio/kamailio/commit/79946bbb6d1731f503fc378ae38311b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-04T09:07:29+01:00 dialog: safety checks for local cseq and contact vars - avoid crash on systems not printing null string of length 0 - GH #1717 (cherry picked from commit … [View More]46401e465d88495d510d2cb36dc36ec86978c53e) --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/79946bbb6d1731f503fc378ae38311b… Patch: https://github.com/kamailio/kamailio/commit/79946bbb6d1731f503fc378ae38311b… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index b6ce4d2bbd..a94dd641a4 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -200,7 +200,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, if (leg==DLG_CALLER_LEG) { if((!msg->cseq && (parse_headers(msg,HDR_CSEQ_F,0)<0 || !msg->cseq)) || !msg->cseq->parsed){ - LM_ERR("bad sip message or missing CSeq hdr :-/\n"); + LM_ERR("bad sip message or missing CSeq hdr\n"); goto error0; } cseq = (get_cseq(msg))->number; @@ -208,6 +208,10 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, /* use the same as in request */ cseq = dlg->cseq[DLG_CALLEE_LEG]; } + if(cseq.s==NULL || cseq.len<=0) { + LM_ERR("empty CSeq number\n"); + goto error0; + } /* extract the contact address */ if (!msg->contact&&(parse_headers(msg,HDR_CONTACT_F,0)<0||!msg->contact)){ @@ -221,6 +225,10 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, goto error0; } contact = ((contact_body_t *)msg->contact->parsed)->contacts->uri; + if(contact.s==NULL || contact.len<=0) { + LM_ERR("empty contact uri\n"); + goto error0; + } /* extract the record-route addresses */ if (leg==DLG_CALLER_LEG) { @@ -250,10 +258,10 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, LM_DBG("leg(%d) route_set [%.*s], contact [%.*s], cseq [%.*s]" " and bind_addr [%.*s]\n", - leg, rr_set.len, rr_set.s, contact.len, contact.s, - cseq.len, cseq.s, + leg, rr_set.len, ZSW(rr_set.s), contact.len, ZSW(contact.s), + cseq.len, ZSW(cseq.s), msg->rcv.bind_address->sock_str.len, - msg->rcv.bind_address->sock_str.s); + ZSW(msg->rcv.bind_address->sock_str.s)); if (dlg_set_leg_info( dlg, tag, &rr_set, &contact, &cseq, leg)!=0) { LM_ERR("dlg_set_leg_info failed (leg %d)\n", leg); [View Less]

1 0

git:5.2:2375d07b: ims_charging : doc is fixed
by Daniel-Constantin Mierla 04 Dec '18

04 Dec '18

Module: kamailio Branch: 5.2 Commit: 2375d07b774aa2d820bbeb155698305576e2ba74 URL: https://github.com/kamailio/kamailio/commit/2375d07b774aa2d820bbeb155698305… Author: Yasin CANER <12412027+ycaner06(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-04T09:06:58+01:00 ims_charging : doc is fixed ims_charging : doc is fixed (cherry picked from commit 37dae368667fc82bc2f60639d722354e6528ec7f) --- Modified: src/modules/ims_charging/… [View More]

1 0

git:5.2:81f32809: core: parse body - debug instead of error log message when mime mismatch
by Daniel-Constantin Mierla 04 Dec '18

04 Dec '18

Module: kamailio Branch: 5.2 Commit: 81f328095f6c06b5ca7cb18b6cdcfad430fb7359 URL: https://github.com/kamailio/kamailio/commit/81f328095f6c06b5ca7cb18b6cdcfad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-04T09:06:49+01:00 core: parse body - debug instead of error log message when mime mismatch - GH #1746 (cherry picked from commit 08820db104c7dbfce36af0f59dfcc28f97cffbd0) --- Modified: src/core/… [View More]

1 0

git:5.2:ae4b66c1: dispatcher: docs for flags value 16
by Daniel-Constantin Mierla 04 Dec '18

04 Dec '18

Module: kamailio Branch: 5.2 Commit: ae4b66c18997103419c48e0fb7b95f53dc200300 URL: https://github.com/kamailio/kamailio/commit/ae4b66c18997103419c48e0fb7b95f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-04T09:06:41+01:00 dispatcher: docs for flags value 16 (cherry picked from commit ba31f4ec4f98487e9f1282fe12a5819d5df0b733) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff:… [View More]

1 0

git:5.2:f7540ffb: dispatcher: flag 16 (1<<4) for destinations with host not having A/AAAA record
by Daniel-Constantin Mierla 04 Dec '18

04 Dec '18

Module: kamailio Branch: 5.2 Commit: f7540ffb88bbeb07956c43665874dae82c2ac969 URL: https://github.com/kamailio/kamailio/commit/f7540ffb88bbeb07956c43665874dae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-04T09:06:31+01:00 dispatcher: flag 16 (1<<4) for destinations with host not having A/AAAA record - use it for addresses that should not be resolved with an A/AAAA query at startup (e.g., it … [View More]is a NAPTR or SRV only record for that specific hostname) - such addresses will not match when using ds_is_from_list(...) - GH #1743 (cherry picked from commit 9eba5b673cc1a80434642b280e6f7d53e310338e) --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/f7540ffb88bbeb07956c43665874dae… Patch: https://github.com/kamailio/kamailio/commit/f7540ffb88bbeb07956c43665874dae… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cb8fe6ea81..59cf1d9302 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -424,11 +424,17 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) /* Do a DNS-Lookup for the Host-Name: */ he = resolvehost(hn); if(he == 0) { - LM_ERR("could not resolve %.*s\n", puri.host.len, puri.host.s); - goto err; + if(dp->flags & DS_NODNSARES_DST) { + dp->irmode |= DS_IRMODE_NOIPADDR; + } else { + LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", + puri.host.len, puri.host.s); + goto err; + } + } else { + /* Store hostent in the dispatcher structure */ + hostent2ip_addr(&dp->ip_address, he, 0); } - /* Free the hostname */ - hostent2ip_addr(&dp->ip_address, he, 0); /* Copy the port out of the URI */ dp->port = puri.port_no; @@ -2957,8 +2963,8 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) if(group == -1) { - rc = ds_is_addr_from_set_r( - _m, pipaddr, tport, tproto, _ds_list, mode, 1); + rc = ds_is_addr_from_set_r(_m, pipaddr, tport, tproto, _ds_list, + mode, 1); } else { list = ds_avl_find(_ds_list, group); if(list) { diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 0675b3ccd3..1c89c756e6 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -44,7 +44,8 @@ #define DS_TRYING_DST 2 /*!< temporary trying destination */ #define DS_DISABLED_DST 4 /*!< admin disabled destination */ #define DS_PROBING_DST 8 /*!< checking destination */ -#define DS_STATES_ALL 15 /*!< all bits for the states of destination */ +#define DS_NODNSARES_DST 16 /*!< no DNS A/AAAA resolve for host in uri */ +#define DS_STATES_ALL 31 /*!< all bits for the states of destination */ #define ds_skip_dst(flags) ((flags) & (DS_INACTIVE_DST|DS_DISABLED_DST)) @@ -68,6 +69,8 @@ #define DS_XAVP_CTX_SKIP_CNT 1 +#define DS_IRMODE_NOIPADDR 1 + /* clang-format on */ extern str ds_db_url; @@ -185,16 +188,17 @@ typedef struct _ds_latency_stats { } ds_latency_stats_t; typedef struct _ds_dest { - str uri; - int flags; - int priority; - int dload; - ds_attrs_t attrs; - ds_latency_stats_t latency_stats; - struct socket_info * sock; - struct ip_addr ip_address; /*!< IP-Address of the entry */ - unsigned short int port; /*!< Port of the URI */ - unsigned short int proto; /*!< Protocol of the URI */ + str uri; /*!< address/uri */ + int flags; /*!< flags */ + int priority; /*!< priority */ + int dload; /*!< load */ + ds_attrs_t attrs; /*!< the atttributes */ + ds_latency_stats_t latency_stats; /*!< latency statistics */ + int irmode; /*!< internal runtime mode (flags) */ + struct socket_info *sock; /*!< pointer to local socket */ + struct ip_addr ip_address; /*!< IP of the address */ + unsigned short int port; /*!< port of the URI */ + unsigned short int proto; /*!< protocol of the URI */ int message_count; struct _ds_dest *next; } ds_dest_t; [View Less]

1 0

git:5.2:6e1f8128: dispatcher: rename internal functions to match the module pattern
by Daniel-Constantin Mierla 04 Dec '18

04 Dec '18

Module: kamailio Branch: 5.2 Commit: 6e1f8128ce5e6ad5946644920ab9ea41bbdd224c URL: https://github.com/kamailio/kamailio/commit/6e1f8128ce5e6ad5946644920ab9ea4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-04T09:06:22+01:00 dispatcher: rename internal functions to match the module pattern (cherry picked from commit 4e7e355db6946850bec061ef4d113bd8b9505cb7) --- Modified: src/modules/dispatcher/… [View More]

1 0

git:5.2:8a29423b: dispatcher: docs - make a bullet list for the possible values for flags field
by Daniel-Constantin Mierla 04 Dec '18

04 Dec '18

Module: kamailio Branch: 5.2 Commit: 8a29423b708029b5d569890bc9681a21bf5ebf16 URL: https://github.com/kamailio/kamailio/commit/8a29423b708029b5d569890bc9681a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-04T09:06:07+01:00 dispatcher: docs - make a bullet list for the possible values for flags field (cherry picked from commit f073f72af6a507e8113e06dc07ad161e3f4632c3) --- Modified: src/modules/… [View More]

1 0

git:5.2:8b6665b5: presence: test if event is dialog when attempting to delete old records
by Daniel-Constantin Mierla 04 Dec '18

04 Dec '18

Module: kamailio Branch: 5.2 Commit: 8b6665b5d27fa8c36764078b9ae615075486a4b3 URL: https://github.com/kamailio/kamailio/commit/8b6665b5d27fa8c36764078b9ae6150… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-04T09:05:55+01:00 presence: test if event is dialog when attempting to delete old records (cherry picked from commit 55c7f781be7cc40d0cd161640a47244aad60c0e7) --- Modified: src/modules/presence/… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018