sr-dev July 2018

sr-dev@lists.kamailio.org

17 participants
229 discussions

git:master:7c1b33cf: mohqueue: replaced SER_VER with VERSIONVAL
by Daniel-Constantin Mierla 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: 7c1b33cfdc8f2c613644d561dc3738c697217efb URL: https://github.com/kamailio/kamailio/commit/7c1b33cfdc8f2c613644d561dc3738c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-06T15:18:00+02:00 mohqueue: replaced SER_VER with VERSIONVAL --- Modified: src/modules/mohqueue/mohq_common.h --- Diff: https://github.com/kamailio/kamailio/commit/7c1b33cfdc8f2c613644d561dc3738c… Patch: https://github.com/kamailio/kamailio/commit/7c1b33cfdc8f2c613644d561dc3738c… --- diff --git a/src/modules/mohqueue/mohq_common.h b/src/modules/mohqueue/mohq_common.h index 1f1c349666..ed6adf8044 100644 --- a/src/modules/mohqueue/mohq_common.h +++ b/src/modules/mohqueue/mohq_common.h @@ -27,7 +27,7 @@ #include "../rr/api.h" -#if SER_VER < 5000000 +#if VERSIONVAL < 5000000 #include "../../data_lump.h" #include "../../data_lump_rpl.h" #include "../../dprint.h" @@ -127,4 +127,4 @@ #define MOHQ_HEADER_EMPTY( hdr1 ) \ ((hdr1) == NULL || MOHQ_STR_EMPTY( &(hdr1)->body )) -#endif /* MOHQ_COMMON_H */ \ No newline at end of file +#endif /* MOHQ_COMMON_H */

1 0

git:master:df947964: Makefile.defs: renamed define name SER_VER to VERSIONVAL
by Daniel-Constantin Mierla 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: df9479643d43adf7a657a6b39371142d1d8a702e URL: https://github.com/kamailio/kamailio/commit/df9479643d43adf7a657a6b39371142… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-06T15:15:05+02:00 Makefile.defs: renamed define name SER_VER to VERSIONVAL - the value is the number computed by the rule: $(VERSION) * 1000000 + $(PATCHLEVEL) * 1000 + $(SUBLEVEL) Example: for kamailio 5.1.4, that is 5001004 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/df9479643d43adf7a657a6b39371142… Patch: https://github.com/kamailio/kamailio/commit/df9479643d43adf7a657a6b39371142… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 8e76de7687..a114c8ae0f 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -119,7 +119,7 @@ MEMMNG ?= 0 # 1 - on (debug mode) MEMDBG ?= 1 -SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ +VERSIONVAL = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \ $(SUBLEVEL) ) RELEASE:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) OS := $(shell uname -s | sed -e s/SunOS/solaris/ -e s/CYGWIN.*/cygwin/ \ @@ -653,7 +653,7 @@ C_DEFS= $(extra_defs) \ -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \ -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\ -D__CPU_$(ARCH) $(os_defs) \ - -DSER_VER=$(SER_VER) \ + -DVERSIONVAL=$(VERSIONVAL) \ -DCFG_DIR='"$(cfg_target)"'\ -DRUN_DIR='"$(run_target)"'

1 0

git:master:b1cfec77: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: b1cfec77e66cb0221dca4c6acea4d3fbb26e0f97 URL: https://github.com/kamailio/kamailio/commit/b1cfec77e66cb0221dca4c6acea4d3f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-06T10:32:09+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/b1cfec77e66cb0221dca4c6acea4d3f… Patch: https://github.com/kamailio/kamailio/commit/b1cfec77e66cb0221dca4c6acea4d3f…

1 0

git:master:d369e0dc: uac: documentation for uac_reg_refresh()
by Daniel-Constantin Mierla 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: d369e0dc61148937a7f565e5b9fbb3d93d6397ac URL: https://github.com/kamailio/kamailio/commit/d369e0dc61148937a7f565e5b9fbb3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-06T10:25:55+02:00 uac: documentation for uac_reg_refresh() --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d369e0dc61148937a7f565e5b9fbb3d… Patch: https://github.com/kamailio/kamailio/commit/d369e0dc61148937a7f565e5b9fbb3d… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 0daac1bdd2..162f491b31 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -942,6 +942,25 @@ failure_route[REMOTE_AUTH] { <programlisting format="linespecific"> ... uac_reg_disable("l_uuid", "account123"); +... + </programlisting> + </example> + </section> + + <section id="uac.f.uac_reg_refresh"> + <title> + <function moreinfo="none">uac_reg_refresh(luuid)</function> + </title> + <para> + Refresh the uac remote registration record based on local uuid. If + the record was already loaded, new values are taken from database, + otherwise a new record is created. + </para> + <example> + <title><function>uac_reg_refresh</function> usage</title> + <programlisting format="linespecific"> +... + uac_reg_refresh("account123"); ... </programlisting> </example>

1 0

git:master:f5628c8c: uac: exported cfg function uac_reg_refresh(luuid)
by Daniel-Constantin Mierla 06 Jul '18

06 Jul '18

Module: kamailio Branch: master Commit: f5628c8cb2d0d0603d56487ce47350914869ec1e URL: https://github.com/kamailio/kamailio/commit/f5628c8cb2d0d0603d56487ce473509… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-06T10:21:27+02:00 uac: exported cfg function uac_reg_refresh(luuid) --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_reg.h --- Diff: https://github.com/kamailio/kamailio/commit/f5628c8cb2d0d0603d56487ce473509… Patch: https://github.com/kamailio/kamailio/commit/f5628c8cb2d0d0603d56487ce473509… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 812602e7ef..3b3e22c0a5 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -101,6 +101,7 @@ static int w_uac_reg_status(struct sip_msg* msg, char* src, char* dst); static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* mode_s); static int w_uac_reg_enable(struct sip_msg* msg, char* pfilter, char* pval); static int w_uac_reg_disable(struct sip_msg* msg, char* pfilter, char* pval); +static int w_uac_reg_refresh(struct sip_msg* msg, char* pluuid, char* p2); static int mod_init(void); static void mod_destroy(void); static int child_init(int rank); @@ -136,10 +137,12 @@ static cmd_export_t cmds[]={ {"uac_reg_request_to", (cmd_function)w_uac_reg_request_to, 2, fixup_spve_igp, fixup_free_spve_igp, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE }, - {"uac_reg_enable", (cmd_function)w_uac_reg_enable, 1, fixup_spve_spve, + {"uac_reg_enable", (cmd_function)w_uac_reg_enable, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE }, - {"uac_reg_disable", (cmd_function)w_uac_reg_disable, 1, fixup_spve_spve, + {"uac_reg_disable", (cmd_function)w_uac_reg_disable, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE }, + {"uac_reg_refresh", (cmd_function)w_uac_reg_refresh, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE }, {"bind_uac", (cmd_function)bind_uac, 1, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -659,6 +662,17 @@ static int w_uac_reg_disable(struct sip_msg* msg, char* pfilter, char* pval) return uac_reg_disable(msg, &sfilter, &sval); } +static int w_uac_reg_refresh(struct sip_msg* msg, char* pluuid, char* p2) +{ + str sluuid; + + if(fixup_get_svalue(msg, (gparam_t*)pluuid, &sluuid)<0) { + LM_ERR("cannot get the local uuid parameter\n"); + return -1; + } + return uac_reg_refresh(msg, &sluuid); +} + static int w_uac_reg_request_to(struct sip_msg* msg, char* src, char* pmode) { str sval; @@ -775,6 +789,11 @@ static sr_kemi_t sr_kemi_uac_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("uac"), str_init("uac_reg_refresh"), + SR_KEMIP_INT, uac_reg_refresh, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 456d725cf4..559e6bd74a 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -1483,6 +1483,31 @@ int uac_reg_db_refresh(str *pl_uuid) return -1; } +/** + * + */ +int uac_reg_refresh(sip_msg_t *msg, str *l_uuid) +{ + int ret; + + if(l_uuid==NULL || l_uuid->s==NULL || l_uuid->len<=0) { + LM_ERR("invalid parameters\n"); + return -1; + } + + ret = uac_reg_db_refresh(l_uuid); + if(ret==0) { + LM_WARN("record not found: %.*s\n", l_uuid->len, l_uuid->s); + return -1; + } else if(ret<0) { + LM_WARN("failed to refresh record: %.*s - check log messages\n", + l_uuid->len, l_uuid->s); + return -1; + } + + return 1; +} + /** * */ diff --git a/src/modules/uac/uac_reg.h b/src/modules/uac/uac_reg.h index f8d40b7e14..769966009b 100644 --- a/src/modules/uac/uac_reg.h +++ b/src/modules/uac/uac_reg.h @@ -57,5 +57,6 @@ int uac_reg_request_to(struct sip_msg *msg, str *src, unsigned int mode); int uac_reg_enable(sip_msg_t *msg, str *attr, str *val); int uac_reg_disable(sip_msg_t *msg, str *attr, str *val); +int uac_reg_refresh(sip_msg_t *msg, str *l_uuid); #endif

1 0

git:master:e62355f2: lib/srdb1: support types for unsigned int and unsigned long long
by Daniel-Constantin Mierla 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: e62355f21538f679c56261db155939ec5dc38559 URL: https://github.com/kamailio/kamailio/commit/e62355f21538f679c56261db155939e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-05T13:21:22+02:00 lib/srdb1: support types for unsigned int and unsigned long long - defined db types DB1_UINT and DB1_UBIGINT --- Modified: src/lib/srdb1/db_ut.c Modified: src/lib/srdb1/db_ut.h Modified: src/lib/srdb1/db_val.c Modified: src/lib/srdb1/db_val.h --- Diff: https://github.com/kamailio/kamailio/commit/e62355f21538f679c56261db155939e… Patch: https://github.com/kamailio/kamailio/commit/e62355f21538f679c56261db155939e…

1 0

git:master:92bff1de: modules: readme files regenerated - blst ... [skip ci]
by Kamailio Dev 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: 92bff1de198bef619809bc008c809148b7129c8b URL: https://github.com/kamailio/kamailio/commit/92bff1de198bef619809bc008c80914… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-05T12:32:04+02:00 modules: readme files regenerated - blst ... [skip ci] --- Modified: src/modules/blst/README Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/92bff1de198bef619809bc008c80914… Patch: https://github.com/kamailio/kamailio/commit/92bff1de198bef619809bc008c80914…

1 0

git:master:aec6e777: uac: docs for uac_reg_enable() and uac_reg_disable()
by Daniel-Constantin Mierla 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: aec6e77727ffccb5708f03c019aa95d54de66dbb URL: https://github.com/kamailio/kamailio/commit/aec6e77727ffccb5708f03c019aa95d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-05T12:27:00+02:00 uac: docs for uac_reg_enable() and uac_reg_disable() --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aec6e77727ffccb5708f03c019aa95d… Patch: https://github.com/kamailio/kamailio/commit/aec6e77727ffccb5708f03c019aa95d… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 07d5467596..0daac1bdd2 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -901,6 +901,51 @@ failure_route[REMOTE_AUTH] { </programlisting> </example> </section> + <section id="uac.f.uac_reg_enable"> + <title> + <function moreinfo="none">uac_reg_enable(attr, val)</function> + </title> + <para> + Enable a remote registration record based on a filter specified by + attribute and value. The attribute can be: l_uuid, l_username, + r_username or auth_username. The value is what should be matched + against the value of the attribute in the remote registration record. + </para> + <para> + The SIP processing is done on the next timer routine. + </para> + <example> + <title><function>uac_reg_enable</function> usage</title> + <programlisting format="linespecific"> +... + uac_reg_enable("l_uuid", "account123"); +... + </programlisting> + </example> + </section> + + <section id="uac.f.uac_reg_disable"> + <title> + <function moreinfo="none">uac_reg_disable(attr, val)</function> + </title> + <para> + Disable a remote registration record based on a filter specified by + attribute and value. The attribute can be: l_uuid, l_username, + r_username or auth_username. The value is what should be matched + against the value of the attribute in the remote registration record. + </para> + <para> + The SIP processing is done on the next timer routine. + </para> + <example> + <title><function>uac_reg_disable</function> usage</title> + <programlisting format="linespecific"> +... + uac_reg_disable("l_uuid", "account123"); +... + </programlisting> + </example> + </section> </section> <section> <title>Pseudo Variables</title>

1 0

git:master:79e28447: uac: remote registrations - added uac_reg_enable() and uac_reg_disable()
by Daniel-Constantin Mierla 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: 79e2844744a3ab17f4ef6d33d4877048fec4e53d URL: https://github.com/kamailio/kamailio/commit/79e2844744a3ab17f4ef6d33d487704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-05T12:13:02+02:00 uac: remote registrations - added uac_reg_enable() and uac_reg_disable() - alternatives to the RPC commands to enable/disable remote registrations from kamailio.cfg (e.g., when receiving a registration from upstream) --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_reg.h --- Diff: https://github.com/kamailio/kamailio/commit/79e2844744a3ab17f4ef6d33d487704… Patch: https://github.com/kamailio/kamailio/commit/79e2844744a3ab17f4ef6d33d487704…

1 0

git:master:3c1b7f5b: blst: docs - better highlighting of examples in readme
by Daniel-Constantin Mierla 05 Jul '18

05 Jul '18

Module: kamailio Branch: master Commit: 3c1b7f5bdfe8d1b99aa314573b73597ba8f5a657 URL: https://github.com/kamailio/kamailio/commit/3c1b7f5bdfe8d1b99aa314573b73597… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-05T01:43:57+02:00 blst: docs - better highlighting of examples in readme --- Modified: src/modules/blst/doc/blst_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/3c1b7f5bdfe8d1b99aa314573b73597… Patch: https://github.com/kamailio/kamailio/commit/3c1b7f5bdfe8d1b99aa314573b73597… --- diff --git a/src/modules/blst/doc/blst_functions.xml b/src/modules/blst/doc/blst_functions.xml index d0dd749fe3..0161f688df 100644 --- a/src/modules/blst/doc/blst_functions.xml +++ b/src/modules/blst/doc/blst_functions.xml @@ -152,7 +152,9 @@ if (msg_status==503){ # blacklist 503 source for Retry-After seconds <example> <title><function>blst_set_ignore</function> usage</title> <programlisting> +... blst_set_ignore(6); # ignore send and connect errors +... </programlisting> </example> </section> @@ -181,7 +183,9 @@ if (msg_status==503){ # blacklist 503 source for Retry-After seconds <example> <title><function>blst_clear_ignore</function> usage</title> <programlisting> +... blst_clear_ignore(4); # ignore connect errors +... </programlisting> </example> </section>

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 July 2018