sr-dev September 2017

sr-dev@lists.kamailio.org

26 participants
271 discussions

git:master:3759c26c: modules: readme files regenerated - statsc ... [skip ci]
by Kamailio Dev 18 Sep '17

18 Sep '17

Module: kamailio Branch: master Commit: 3759c26c486c879a798b41a186870fda0f546506 URL: https://github.com/kamailio/kamailio/commit/3759c26c486c879a798b41a186870fd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-09-18T09:16:49+02:00 modules: readme files regenerated - statsc ... [skip ci] --- Modified: src/modules/statsc/README --- Diff: https://github.com/kamailio/kamailio/commit/3759c26c486c879a798b41a186870fd… Patch: https://github.com/kamailio/kamailio/commit/3759c26c486c879a798b41a186870fd… --- diff --git a/src/modules/statsc/README b/src/modules/statsc/README index a753399731..a43e2ff5c4 100644 --- a/src/modules/statsc/README +++ b/src/modules/statsc/README @@ -73,8 +73,8 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules The following modules must be loaded along this module: - * various - for getting access to the statistics exported by these - modules. + * various - (optional, e.g., sl, tm, usrloc) for getting access to + the statistics exported by these modules. 2.2. External Libraries or Applications

1 0

git:master:e97c7c8b: pv: exported pvx.evalx() to kemi framework
by Daniel-Constantin Mierla 18 Sep '17

18 Sep '17

Module: kamailio Branch: master Commit: e97c7c8b5ac983206423daff5b2b0ce016eb5392 URL: https://github.com/kamailio/kamailio/commit/e97c7c8b5ac983206423daff5b2b0ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-18T09:02:02+02:00 pv: exported pvx.evalx() to kemi framework - the equivalent of pv_evalx() --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/e97c7c8b5ac983206423daff5b2b0ce… Patch: https://github.com/kamailio/kamailio/commit/e97c7c8b5ac983206423daff5b2b0ce… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 8dccdb3a0b..e7afac57b9 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -906,6 +906,9 @@ int pv_evalx_fixup(void** param, int param_no) return 0; } +/** + * + */ int w_pv_evalx(struct sip_msg *msg, char *dst, str *fmt) { pv_spec_t *ispec=NULL; @@ -943,6 +946,41 @@ int w_pv_evalx(struct sip_msg *msg, char *dst, str *fmt) /** * */ +int ki_pv_evalx(sip_msg_t *msg, str *dst, str *fmt) +{ + pv_value_t val; + pv_spec_t *ispec=NULL; + + if(dst==NULL || dst->s==NULL || dst->len<=0) { + LM_ERR("invalid destination var name\n"); + return -1; + } + ispec = pv_cache_get(dst); + if(ispec==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", dst->len, dst->s); + return -1; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(pv_eval_str(msg, &val.rs, fmt)<0) { + LM_ERR("cannot eval reparsed value of second parameter\n"); + return -1; + } + + val.flags = PV_VAL_STR; + if(ispec->setf(msg, &ispec->pvp, EQ_T, &val)<0) { + LM_ERR("setting PV failed\n"); + goto error; + } + + return 1; +error: + return -1; +} + +/** + * + */ static const char* rpc_shv_set_doc[2] = { "Set a shared variable (args: name type value)", 0 @@ -1010,6 +1048,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("evalx"), + SR_KEMIP_INT, ki_pv_evalx, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; @@ -1027,4 +1070,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return -1; } return register_trans_mod(path, mod_trans); -} \ No newline at end of file +}

1 0

git:master:24e09eea: statsc: small updates to docs
by Daniel-Constantin Mierla 18 Sep '17

18 Sep '17

Module: kamailio Branch: master Commit: 24e09eeafc489b2d37c759ccedc0cdb65ebe2613 URL: https://github.com/kamailio/kamailio/commit/24e09eeafc489b2d37c759ccedc0cdb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-18T08:53:33+02:00 statsc: small updates to docs --- Modified: src/modules/statsc/doc/statsc_admin.xml Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/24e09eeafc489b2d37c759ccedc0cdb… Patch: https://github.com/kamailio/kamailio/commit/24e09eeafc489b2d37c759ccedc0cdb… --- diff --git a/src/modules/statsc/doc/statsc_admin.xml b/src/modules/statsc/doc/statsc_admin.xml index 1ba4ec8202..5b6cf50b10 100644 --- a/src/modules/statsc/doc/statsc_admin.xml +++ b/src/modules/statsc/doc/statsc_admin.xml @@ -29,14 +29,14 @@ <title>&kamailio; Modules</title> <para> The following modules must be loaded along this module: - <itemizedlist> - <listitem> - <para> - <emphasis>various</emphasis> - for getting access - to the statistics exported by these modules. - </para> - </listitem> - </itemizedlist> + <itemizedlist> + <listitem> + <para> + <emphasis>various</emphasis> - (optional, e.g., sl, tm, usrloc) + for getting access to the statistics exported by these modules. + </para> + </listitem> + </itemizedlist> </para> </section> <section> @@ -60,7 +60,7 @@ <section id="statsc.p.interval"> <title><varname>interval</varname> (int)</title> <para> - Timer interval when to record the value for statistics. + Timer interval when to record the value for statistics. </para> <para> <emphasis> @@ -79,7 +79,7 @@ modparam("statsc", "interval", 300) <section id="statsc.p.items"> <title><varname>items</varname> (int)</title> <para> - How many items to store for each statistic. + How many items to store for each statistic. </para> <para> <emphasis> diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 77c112b901..e05109df36 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -351,7 +351,7 @@ static void statsc_rpc_report(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Missing command parameter"); return; } - + if(cname.len==4 && strncmp(cname.s, "list", 4)==0) { cmode = 1; } else if(cname.len==4 && strncmp(cname.s, "diff", 4)==0) { @@ -505,4 +505,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_statsc_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:c8a8e368: ipops: removed svn id, history; coherent indentation
by Daniel-Constantin Mierla 18 Sep '17

18 Sep '17

Module: kamailio Branch: master Commit: c8a8e368d5145a5ad5298fea04cfd79a764ce05a URL: https://github.com/kamailio/kamailio/commit/c8a8e368d5145a5ad5298fea04cfd79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-18T08:53:33+02:00 ipops: removed svn id, history; coherent indentation --- Modified: src/modules/ipops/api.c Modified: src/modules/ipops/api.h Modified: src/modules/ipops/detailed_ip_type.c Modified: src/modules/ipops/detailed_ip_type.h Modified: src/modules/ipops/ip_parser.c Modified: src/modules/ipops/ip_parser.h Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h Modified: src/modules/ipops/rfc1918_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/c8a8e368d5145a5ad5298fea04cfd79… Patch: https://github.com/kamailio/kamailio/commit/c8a8e368d5145a5ad5298fea04cfd79…

1 0

[kamailio/kamailio] Daemon not restated if process exited with not null code (#1085)
by sergey-safarov 17 Sep '17

17 Sep '17

Details in attached log file. [kamailio-fail.txt](https://github.com/kamailio/kamailio/files/949032/kamail… -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1085

3 4

git:master:b38455c9: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 17 Sep '17

17 Sep '17

Module: kamailio Branch: master Commit: b38455c90c858044e474a4d864f5f7156a8f08cf URL: https://github.com/kamailio/kamailio/commit/b38455c90c858044e474a4d864f5f71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-09-17T11:01:58+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/b38455c90c858044e474a4d864f5f71… Patch: https://github.com/kamailio/kamailio/commit/b38455c90c858044e474a4d864f5f71… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index 131baca9c5..b8faee9efb 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -1021,10 +1021,20 @@ modparam("usrloc", "db_timer_clean", 1) * contact - contact string to be added * expires - expires value of the contact * Q - Q value of the contact - * path value of the contact + * path value with the Path vector (use '0' or '.' if it should not be + set) * flags - internal USRLOC flags of the contact * cflags - per branch flags of the contact * methods - mask with supported requests of the contact + * received (optional) value with the received-from address (source + address) (use '0' or '.' if it should not be set). Format: + sip:srcip:srcport;transport=abc + * socket (optional) value with the local socket address (use '0' or + '.' if it should not be set). Format: proto:localip:localport + + Note: the position of parameters is relevant, in the case of optional + parameters, use '0' or '.' for parameters that should not be set which + are positioned before any parameter that has to be set. 4.7. ul.db_users

1 0

[kamailio/kamailio] USRLOC JSONRPC ul.add - ability to set all entry fields (#1225)
by kbdfck 17 Sep '17

17 Sep '17

Looking into code it seems RPC functions of USRLOC don't allow setting all fields for USRLOC entry, for example, Received and Socket. It would be great if we can set these, because we need to have ability to transfer contacts from other server to Kamailio. I think at present this can be done sending specially crafted fake REGISTER packets or calling special route from HTTP with some tricks for saving contact and received, but as for me it would be great to set it from RPC because we already have ul.add method. It also would be cool if we can use named parameters in JSONRPC params: {} section with names corresponding to usrloc fields, like 'table', 'AOR', 'received' and so on. Maybe on specual key not to mix with current 'params'. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1225

2 3

git:master:d6af9b81: usrloc: updated docs for rpc ul.add command
by Daniel-Constantin Mierla 17 Sep '17

17 Sep '17

Module: kamailio Branch: master Commit: d6af9b8146ae6fc6fda692e669fb334ba1a959bd URL: https://github.com/kamailio/kamailio/commit/d6af9b8146ae6fc6fda692e669fb334… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-17T10:56:35+02:00 usrloc: updated docs for rpc ul.add command --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d6af9b8146ae6fc6fda692e669fb334… Patch: https://github.com/kamailio/kamailio/commit/d6af9b8146ae6fc6fda692e669fb334… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 1dd4ae378a..fde16498d7 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1268,7 +1268,8 @@ modparam("usrloc", "db_timer_clean", 1) <emphasis>Q</emphasis> - Q value of the contact </para></listitem> <listitem><para> - <emphasis>path</emphasis> value of the contact + <emphasis>path</emphasis> value with the Path vector (use '0' + or '.' if it should not be set) </para></listitem> <listitem><para> <emphasis>flags</emphasis> - internal USRLOC flags of the @@ -1282,7 +1283,23 @@ modparam("usrloc", "db_timer_clean", 1) <emphasis>methods</emphasis> - mask with supported requests of the contact </para></listitem> + <listitem><para> + <emphasis>received</emphasis> (optional) value with the + received-from address (source address) (use '0' + or '.' if it should not be set). Format: + sip:srcip:srcport;transport=abc + </para></listitem> + <listitem><para> + <emphasis>socket</emphasis> (optional) value with the local + socket address (use '0' or '.' if it should not be set). Format: + proto:localip:localport + </para></listitem> </itemizedlist> + <para> + Note: the position of parameters is relevant, in the case of + optional parameters, use '0' or '.' for parameters that should not + be set which are positioned before any parameter that has to be set. + </para> </section> <section id="usrloc.r.db_users">

1 0

git:master:e0b82270: usrloc: rpc ul.add can set also received and socket fields
by Daniel-Constantin Mierla 17 Sep '17

17 Sep '17

Module: kamailio Branch: master Commit: e0b8227051ff5cd7d021888b3cf2cfb183bf7d58 URL: https://github.com/kamailio/kamailio/commit/e0b8227051ff5cd7d021888b3cf2cfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-17T10:49:18+02:00 usrloc: rpc ul.add can set also received and socket fields --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e0b8227051ff5cd7d021888b3cf2cfb… Patch: https://github.com/kamailio/kamailio/commit/e0b8227051ff5cd7d021888b3cf2cfb… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 88eaa284b7..d9533af262 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -584,7 +584,6 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) str aor = {0, 0}; str contact = {0, 0}; str path = {0, 0}; - str received = {0, 0}; str socket = {0, 0}; str temp = {0, 0}; double dtemp; @@ -594,11 +593,12 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) udomain_t *dom; int ret; - memset( &ci, 0, sizeof(ucontact_info_t)); + memset(&ci, 0, sizeof(ucontact_info_t)); - ret = rpc->scan(ctx, "SSSdfSddd", &table, &aor, &contact, &ci.expires, - &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods); - if ( ret != 9) { + ret = rpc->scan(ctx, "SSSdfSddd*SS", &table, &aor, &contact, &ci.expires, + &dtemp, &path, &ci.flags, &ci.cflags, &ci.methods, &ci.received, + &socket); + if (ret < 9) { rpc->fault(ctx, 500, "Not enough parameters or wrong format"); return; } @@ -607,6 +607,19 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } else { LM_DBG("path == 0 -> unset\n"); } + if(ret>9) { + /* received parameter */ + if(!ul_rpc_is_param_set(&ci.received)) { + ci.received.s = 0; + ci.received.len = 0; + } + } + if(ret>10) { + /* socket parameter */ + if(ul_rpc_is_param_set(&socket)) { + ci.sock = lookup_local_socket(&socket); + } + } LM_DBG("ret: %d table:%.*s aor:%.*s contact:%.*s expires:%d" " dtemp:%f path:%.*s flags:%d bflags:%d methods:%d\n", ret, table.len, table.s, aor.len, aor.s, contact.len, contact.s, @@ -624,7 +637,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } /* process the aor */ - if ( rpc_fix_aor(&aor) != 0 ) { + if (rpc_fix_aor(&aor) != 0 ) { rpc->fault(ctx, 500, "Domain missing in AOR"); return; } @@ -636,13 +649,13 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } ci.ruid = _ul_sruid.uid; - lock_udomain( dom, &aor); + lock_udomain(dom, &aor); - ret = get_urecord( dom, &aor, &r); + ret = get_urecord(dom, &aor, &r); if(ret==1) { - if (insert_urecord( dom, &aor, &r) < 0) + if (insert_urecord(dom, &aor, &r) < 0) { - unlock_udomain( dom, &aor); + unlock_udomain(dom, &aor); rpc->fault(ctx, 500, "Can't insert record"); return; } @@ -651,7 +664,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) if (get_ucontact( r, &contact, &rpc_ul_cid, &rpc_ul_path, RPC_UL_CSEQ+1, &c) < 0) { - unlock_udomain( dom, &aor); + unlock_udomain(dom, &aor); rpc->fault(ctx, 500, "Can't get record"); return; } @@ -670,22 +683,22 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) if (update_ucontact( r, c, &ci) < 0) { release_urecord(r); - unlock_udomain( dom, &aor); + unlock_udomain(dom, &aor); rpc->fault(ctx, 500, "Can't update contact"); return; } } else { - if ( insert_ucontact( r, &contact, &ci, &c) < 0 ) + if ( insert_ucontact(r, &contact, &ci, &c) < 0 ) { release_urecord(r); - unlock_udomain( dom, &aor); + unlock_udomain(dom, &aor); rpc->fault(ctx, 500, "Can't insert contact"); return; } } release_urecord(r); - unlock_udomain( dom, &aor); + unlock_udomain(dom, &aor); return; }

1 0

git:master:dc8644a0: usrloc: helper function to test if a rpc parameter is set or not
by Daniel-Constantin Mierla 17 Sep '17

17 Sep '17

Module: kamailio Branch: master Commit: dc8644a0326d90f2c766e3462762fc3dfdf73669 URL: https://github.com/kamailio/kamailio/commit/dc8644a0326d90f2c766e3462762fc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-17T10:26:18+02:00 usrloc: helper function to test if a rpc parameter is set or not - useful for optional parameters which can be given '0' or '.' value to indicate that it is not intended to be set --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/dc8644a0326d90f2c766e3462762fc3… Patch: https://github.com/kamailio/kamailio/commit/dc8644a0326d90f2c766e3462762fc3… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index f679ef5cff..88eaa284b7 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -556,6 +556,23 @@ static const char* ul_rpc_flush_doc[2] = { 0 }; +/** + * test if a rpc parameter is set + * - used for optional parameters which can be given '.' or '0' value + * in order to indicate is not intended to be set + * - return: 1 if parameter is set; 0 if parameter is not set + */ +int ul_rpc_is_param_set(str *p) +{ + if(p==NULL || p->len==0 || p->s==NULL) + return 0; + if(p->len>1) + return 1; + if((strncmp(p->s, ".", 1)==0) || (strncmp(p->s, "0", 1)==0)) + return 0; + return 1; +} + /*! * \brief Add a new contact for an address of record * \note Expects 9 parameters: table name, AOR, contact, expires, Q, @@ -567,6 +584,8 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) str aor = {0, 0}; str contact = {0, 0}; str path = {0, 0}; + str received = {0, 0}; + str socket = {0, 0}; str temp = {0, 0}; double dtemp; ucontact_info_t ci; @@ -583,10 +602,10 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Not enough parameters or wrong format"); return; } - if(path.len==1 && (strncmp(path.s, "0", 1)==0)) { - LM_DBG("path == 0 -> unset\n"); - } else { + if(ul_rpc_is_param_set(&path)) { ci.path = &path; + } else { + LM_DBG("path == 0 -> unset\n"); } LM_DBG("ret: %d table:%.*s aor:%.*s contact:%.*s expires:%d" " dtemp:%f path:%.*s flags:%d bflags:%d methods:%d\n",

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2017