sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
284 discussions

git:master:45d7500a: registrar: proper attribute name for contact record xavp

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 45d7500ace163660047e241df9a7b178638e3329 URL: https://github.com/kamailio/kamailio/commit/45d7500ace163660047e241df9a7b17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T18:49:06+02:00 registrar: proper attribute name for contact record xavp --- Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/45d7500ace163660047e241df9a7b17… Patch: https://github.com/kamailio/kamailio/commit/45d7500ace163660047e241df9a7b17… --- diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index dca26fa30e..5cf0eb6d0f 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -937,7 +937,7 @@ int ki_lookup_xavp(sip_msg_t* msg, str *utname, str* uri, memset(&nxval, 0, sizeof(sr_xval_t)); nxval.type = SR_XTYPE_STR; nxval.v.s = ptr->received; - STR_STATIC_SET(fxname, "socket"); + STR_STATIC_SET(fxname, "dsturi"); if(xavp_add_value(&fxname, &nxval, &cxavp)==NULL) { LM_ERR("failed to add xavp %.*s field\n", fxname.len, fxname.s); goto error;

1 year, 12 months

git:master:4d478b74: registrar: docs for lookup_xavp(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4d478b741e8a21365d1e7c0342476f2e77cca34c URL: https://github.com/kamailio/kamailio/commit/4d478b741e8a21365d1e7c0342476f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T18:41:32+02:00 registrar: docs for lookup_xavp(...) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4d478b741e8a21365d1e7c0342476f2… Patch: https://github.com/kamailio/kamailio/commit/4d478b741e8a21365d1e7c0342476f2… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 50ba66f38f..15fcc0d1fc 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1450,6 +1450,84 @@ lookup_branches("location"); </example> </section> + <section id="registrar.f.lookup_xavp"> + <title> + <function moreinfo="none">lookup_xavp(ultable, uri, rxname, cxname)</function> + </title> + <para> + Similar to lookup(...), but store the location record attributes + in XAVPs. Note that not all contact record fields are stored + </para> + <para>Meaning of the parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>ultable</emphasis> - name of the usrloc table that is used + for the lookup. + </para> + <listitem> + </listitem> + <para> + <emphasis>uri</emphasis> - the URI to be searched in location table. + </para> + </listitem> + <listitem> + <para> + <emphasis>rxname</emphasis> - name of the XAVP to store record + attributes. These are: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>aor</emphasis> - the address of record. + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + <emphasis>cxname</emphasis> - name of the XAVP to store content + attributes, name mapping is done from the perspective of using + them to send out SIP requests. These are: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>uri</emphasis> - the contact address. + </para> + </listitem> + <listitem> + <para> + <emphasis>socket</emphasis> - the socket of the contact record. + </para> + </listitem> + <listitem> + <para> + <emphasis>dsturi</emphasis> - the destination uri of the contact + record (the received field in location contact). + </para> + </listitem> + </itemizedlist> + </itemizedlist> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>lookup_xavp</function> usage</title> + <programlisting format="linespecific"> +... +lookup_xavp("location", "$fu", "rul", "cul"); +xinfo("aor: $xavp(rul=>aor)\n"); +xinfo("number of contacts: $xavp(rul>count)\n"); +xinfo("first contact record - uri: $xavp(cul>uri)\n"); +xinfo("first contact record - socket: $xavp(cul>socket)\n"); +... +</programlisting> + </example> + </section> + <section id="registrar.f.registered"> <title> <function moreinfo="none">registered(domain [, uri [, match_option [, match_action]]])</function>

1 year, 12 months

git:master:19496226: registrar: added lookup_xavp("ultable", "uri", "rxname", "cxname")

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 194962260c4e880a199797fa0d9faf8e766c8d76 URL: https://github.com/kamailio/kamailio/commit/194962260c4e880a199797fa0d9faf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T18:18:14+02:00 registrar: added lookup_xavp("ultable", "uri", "rxname", "cxname") - lookup of uri and store record and contact attributes in xavps --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/regpv.c Modified: src/modules/registrar/regpv.h --- Diff: https://github.com/kamailio/kamailio/commit/194962260c4e880a199797fa0d9faf8… Patch: https://github.com/kamailio/kamailio/commit/194962260c4e880a199797fa0d9faf8…

1 year, 12 months

git:master:9100baa7: core: str - helerp macros to set str variable with char* value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9100baa7e3762b49a339933b2790a9d9cb1128c5 URL: https://github.com/kamailio/kamailio/commit/9100baa7e3762b49a339933b2790a9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T13:51:52+02:00 core: str - helerp macros to set str variable with char* value --- Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/9100baa7e3762b49a339933b2790a9d… Patch: https://github.com/kamailio/kamailio/commit/9100baa7e3762b49a339933b2790a9d… --- diff --git a/src/core/str.h b/src/core/str.h index 063a9e9398..615b35499e 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -142,6 +142,22 @@ typedef struct _str str; } \ } while(0) +/** + * set str x variable with static value char* v + */ +#define STR_STATIC_SET(x, v) do { \ + (x).s = v; \ + (x).len = sizeof(v) - 1; \ +} while (0); + +/** + * set str x variable with char* v + */ +#define STR_SET(x, v) do { \ + (x).s = v; \ + (x).len = strlen(v); \ +} while (0); + /** * str with value: not null and not empty */

1 year, 12 months

git:master:67f6a289: pv: declare pv wrapper function with two parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 67f6a2890a38d81dae934e01a2ca536a45625c42 URL: https://github.com/kamailio/kamailio/commit/67f6a2890a38d81dae934e01a2ca536… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T13:20:50+02:00 pv: declare pv wrapper function with two parameters --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/67f6a2890a38d81dae934e01a2ca536… Patch: https://github.com/kamailio/kamailio/commit/67f6a2890a38d81dae934e01a2ca536… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 237ed8c7f5..907f45b2c4 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -601,7 +601,7 @@ static int w_sbranch_set_ruri(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_append(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_reset(sip_msg_t *msg, char p1, char *p2); static int w_var_to_xavp(sip_msg_t *msg, char *p1, char *p2); -static int w_xavp_to_var(sip_msg_t *msg, char *p1); +static int w_xavp_to_var(sip_msg_t *msg, char *p1, char *p2); static int w_xavi_child_seti(sip_msg_t *msg, char *prname, char *pcname, char *pval); @@ -888,7 +888,7 @@ static int ki_var_to_xavp(sip_msg_t *msg, str *varname, str *xname) /** * xavp to script variable */ -static int w_xavp_to_var(sip_msg_t *msg, char *s1) +static int w_xavp_to_var(sip_msg_t *msg, char *s1, char *p2) { str xname = STR_NULL;

1 year, 12 months

siptrace error

by Luis Azedo

Hi, has anyone seen this error before ? running from master thanks 116(469) ERROR: <core> [main.c:1231]: parse_phostport(): bad protocol in wss: 192.168.1.197:61609 116(469) ERROR: siptrace [siptrace.c:2545]: pv_get_siptrace(): invalid src_addr: wss: 192.168.1.197:61609 116(469) ERROR: <core> [main.c:1231]: parse_phostport(): bad protocol in wss: 10.10.4.159:5065 116(469) ERROR: siptrace [siptrace.c:2554]: pv_get_siptrace(): invalid dst_addr: wss: 10.10.4.159:5065 snippet of config modparam("siptrace", "trace_mode", 1) modparam("siptrace", "trace_init_mode", 1) event_route[siptrace:msg] { if ($sel(cfg_get.kazoo.trace_ignored_methods) != $null) { if($rm =~ $sel(cfg_get.kazoo.trace_ignored_methods)) { xlog("L_DEBUG", "dropping trace for method $rm\n"); drop(); } } if ($sel(cfg_get.kazoo.trace_ignored_ports) != $null) { if($Rp =~ $sel(cfg_get.kazoo.trace_ignored_ports)) { xlog("L_INFO", "dropping trace for port $Rp\n"); drop(); } } #!ifdef KZ_TRACE_IGNORE_INTERNAL if ($siptrace(src_hostip) =~ "127\\.0\\.0\\.1") drop(); if ($siptrace(dst_hostip) =~ "127\\.0\\.0\\.1") drop(); #!endif }

1 year, 12 months

git:master:69f33615: registrar: kemi functions to get $ulc(...) attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 69f33615874cf3505a6ce9ea9e74be2797bbe433 URL: https://github.com/kamailio/kamailio/commit/69f33615874cf3505a6ce9ea9e74be2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T11:21:46+02:00 registrar: kemi functions to get $ulc(...) attributes --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/regpv.c Modified: src/modules/registrar/regpv.h --- Diff: https://github.com/kamailio/kamailio/commit/69f33615874cf3505a6ce9ea9e74be2… Patch: https://github.com/kamailio/kamailio/commit/69f33615874cf3505a6ce9ea9e74be2…

1 year, 12 months

git:master:9f9fd6ff: pv: kemi function to get $shvinc(name) value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9f9fd6ff153fe72aa4bb07f81aa4fbcf67cd9491 URL: https://github.com/kamailio/kamailio/commit/9f9fd6ff153fe72aa4bb07f81aa4fbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-11T16:42:19+02:00 pv: kemi function to get $shvinc(name) value --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_shv.c Modified: src/modules/pv/pv_shv.h --- Diff: https://github.com/kamailio/kamailio/commit/9f9fd6ff153fe72aa4bb07f81aa4fbc… Patch: https://github.com/kamailio/kamailio/commit/9f9fd6ff153fe72aa4bb07f81aa4fbc… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index db832d7419..237ed8c7f5 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -2872,6 +2872,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("shvinc_get"), + SR_KEMIP_XVAL, ki_shvinc_get, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("pv_var_to_xavp"), SR_KEMIP_INT, ki_var_to_xavp, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, diff --git a/src/modules/pv/pv_shv.c b/src/modules/pv/pv_shv.c index 392c4d823d..f3469ccf55 100644 --- a/src/modules/pv/pv_shv.c +++ b/src/modules/pv/pv_shv.c @@ -796,4 +796,34 @@ sr_kemi_xval_t* ki_shv_get(sip_msg_t *msg, str *vname) } } +/** + * + */ +sr_kemi_xval_t* ki_shvinc_get(sip_msg_t *msg, str *vname) +{ + sh_var_t *shv = NULL; + + memset(&_sr_kemi_shv_xval, 0, sizeof(sr_kemi_xval_t)); + + shv = get_shvar_by_name(vname); + if(shv==NULL) { + LM_WARN("$shv(%.*s) is not defined - return value 0\n", + vname->len, vname->s); + _sr_kemi_shv_xval.vtype = SR_KEMIP_INT; + _sr_kemi_shv_xval.v.n = 0; + return &_sr_kemi_shv_xval; + } + + lock_shvar(shv); + if(shv->v.flags&VAR_VAL_STR) { + _sr_kemi_shv_xval.v.n = 0; + } else { + shv->v.value.n++; + _sr_kemi_shv_xval.v.n = shv->v.value.n; + } + unlock_shvar(shv); + _sr_kemi_shv_xval.vtype = SR_KEMIP_INT; + return &_sr_kemi_shv_xval; +} + /* vi: set ts=4 sw=4 tw=79:ai:cindent: */ diff --git a/src/modules/pv/pv_shv.h b/src/modules/pv/pv_shv.h index 65a4d1afc9..50311f5787 100644 --- a/src/modules/pv/pv_shv.h +++ b/src/modules/pv/pv_shv.h @@ -71,6 +71,7 @@ void rpc_shv_set(rpc_t* rpc, void* c); int ki_shv_seti(sip_msg_t *msg, str *vname, int ival); int ki_shv_sets(sip_msg_t *msg, str *vname, str *sval); sr_kemi_xval_t* ki_shv_get(sip_msg_t *msg, str *vname); +sr_kemi_xval_t* ki_shvinc_get(sip_msg_t *msg, str *vname); #endif

1 year, 12 months

git:master:6770afc5: pv: use fixup get int value to evaluate the index parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6770afc5329c18371fb5149eaf5ef2a95f286eff URL: https://github.com/kamailio/kamailio/commit/6770afc5329c18371fb5149eaf5ef2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-11T16:16:47+02:00 pv: use fixup get int value to evaluate the index parameter --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/6770afc5329c18371fb5149eaf5ef2a… Patch: https://github.com/kamailio/kamailio/commit/6770afc5329c18371fb5149eaf5ef2a… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 2113115a15..db832d7419 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -935,7 +935,7 @@ static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx) LM_ERR("failed to get the xavp name\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t*)pidx, &idx)<0) { + if(fixup_get_ivalue(msg, (gparam_t*)pidx, &idx)<0) { LM_ERR("failed to get the xavp index\n"); return -1; }

1 year, 12 months

git:master:eebdabe4: pv: added $shvinc(name) - return incremented value of $shv(inc)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: eebdabe4850d99ff937171d4b723122726c0aa43 URL: https://github.com/kamailio/kamailio/commit/eebdabe4850d99ff937171d4b723122… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-11T16:11:42+02:00 pv: added $shvinc(name) - return incremented value of $shv(inc) - leverage internal mutex to avoid config locks --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_shv.c Modified: src/modules/pv/pv_shv.h --- Diff: https://github.com/kamailio/kamailio/commit/eebdabe4850d99ff937171d4b723122… Patch: https://github.com/kamailio/kamailio/commit/eebdabe4850d99ff937171d4b723122… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 685c0ef9f0..2113115a15 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -526,6 +526,8 @@ static pv_export_t mod_pvs[] = { { {"shv", (sizeof("shv")-1)}, PVT_OTHER, pv_get_shvar, pv_set_shvar, pv_parse_shvar_name, 0, 0, 0}, + { {"shvinc", (sizeof("shvinc")-1)}, PVT_OTHER, pv_get_shvinc, + 0, pv_parse_shvar_name, 0, 0, 0}, { {"time", (sizeof("time")-1)}, PVT_CONTEXT, pv_get_local_time, 0, pv_parse_time_name, 0, 0, 0}, { {"timef", (sizeof("timef")-1)}, PVT_CONTEXT, pv_get_local_strftime, diff --git a/src/modules/pv/pv_shv.c b/src/modules/pv/pv_shv.c index fb4de51114..392c4d823d 100644 --- a/src/modules/pv/pv_shv.c +++ b/src/modules/pv/pv_shv.c @@ -387,6 +387,38 @@ int pv_get_shvar(struct sip_msg *msg, pv_param_t *param, return 0; } +int pv_get_shvinc(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + int len = 0; + char *sval = NULL; + sh_var_t *shv=NULL; + + if(msg==NULL || res==NULL) + return -1; + + if(param==NULL || param->pvn.u.dname==0) + return pv_get_null(msg, param, res); + + shv= (sh_var_t*)param->pvn.u.dname; + + lock_shvar(shv); + if(shv->v.flags&VAR_VAL_STR) + { + res->ri = 0; + } else { + shv->v.value.n++; + res->ri = shv->v.value.n; + } + unlock_shvar(shv); + + sval = sint2str(res->ri, &len); + res->rs.s = sval; + res->rs.len = len; + res->flags = PV_VAL_STR|PV_VAL_INT|PV_TYPE_INT; + return 0; +} + int pv_set_shvar(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { diff --git a/src/modules/pv/pv_shv.h b/src/modules/pv/pv_shv.h index b7873a037e..65a4d1afc9 100644 --- a/src/modules/pv/pv_shv.h +++ b/src/modules/pv/pv_shv.h @@ -57,6 +57,7 @@ int pv_parse_shvar_name(pv_spec_p sp, str *in); int pv_get_shvar(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_set_shvar(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val); +int pv_get_shvinc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int shvar_init_locks(void); void shvar_destroy_locks(void);

1 year, 12 months

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2022