sr-dev May 2021

sr-dev@lists.kamailio.org

12 participants
286 discussions

git:master:ec600414: uac: docs for reg_use_domain parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ec600414a3ba01e641beda6c11201b7185c879db URL: https://github.com/kamailio/kamailio/commit/ec600414a3ba01e641beda6c11201b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-10T09:39:16+02:00 uac: docs for reg_use_domain parameter --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ec600414a3ba01e641beda6c11201b7… Patch: https://github.com/kamailio/kamailio/commit/ec600414a3ba01e641beda6c11201b7… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 52362af1e3..b6184a6daa 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -582,6 +582,24 @@ modparam("uac", "reg_active", 0) <programlisting format="linespecific"> ... modparam("uac", "reg_gc_interval", 60) +... + </programlisting> + </example> + </section> + <section id="uac.p.reg_use_domain"> + <title><varname>reg_use_domain</varname> (int)</title> + <para> + If set to 1, domain part of URIs is used by functions doing + lookup on user name. + </para> + <para> + <emphasis>Default value is <quote>0</quote>.</emphasis> + </para> + <example> + <title>Set <varname>reg_use_domain</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("uac", "reg_use_domain", 1) ... </programlisting> </example> @@ -647,8 +665,6 @@ end </programlisting> </example> </section> - - </section> <section>

2 years, 11 months

git:master:cd2abf6e: uac: exposed reg_use_domain via modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cd2abf6e278539b31ebfd355acf841faf6121e25 URL: https://github.com/kamailio/kamailio/commit/cd2abf6e278539b31ebfd355acf841f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-10T09:34:47+02:00 uac: exposed reg_use_domain via modparam - control if the lookup over username uses also domain --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/cd2abf6e278539b31ebfd355acf841f… Patch: https://github.com/kamailio/kamailio/commit/cd2abf6e278539b31ebfd355acf841f… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 46503bf592..50873ef557 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -114,6 +114,7 @@ static int child_init(int rank); extern int reg_timer_interval; extern int _uac_reg_gc_interval; +extern int _uac_reg_use_domain; static pv_export_t mod_pvs[] = { { {"uac_req", sizeof("uac_req")-1}, PVT_OTHER, pv_get_uac_req, pv_set_uac_req, @@ -184,7 +185,8 @@ static param_export_t params[] = { {"reg_random_delay", INT_PARAM, &reg_random_delay }, {"reg_active", INT_PARAM, &reg_active_param }, {"reg_gc_interval", INT_PARAM, &_uac_reg_gc_interval }, - {"reg_hash_size", INT_PARAM, &reg_htable_size }, + {"reg_hash_size", INT_PARAM, &reg_htable_size }, + {"reg_use_domain", PARAM_INT, &_uac_reg_use_domain }, {"default_socket", PARAM_STR, &uac_default_socket}, {"event_callback", PARAM_STR, &uac_event_callback}, {0, 0, 0} diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index c36ee8ac82..1ea1b62135 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -116,7 +116,7 @@ static reg_ht_t *_reg_htable = NULL; static reg_ht_t *_reg_htable_gc = NULL; static gen_lock_t *_reg_htable_gc_lock = NULL; -int reg_use_domain = 0; +int _uac_reg_use_domain = 0; int reg_timer_interval = 90; int reg_retry_interval = 0; int reg_htable_size = 4; @@ -1630,7 +1630,7 @@ int uac_reg_lookup(struct sip_msg *msg, str *src, pv_spec_t *dst, int mode) LM_ERR("failed to parse uri\n"); return -2; } - reg = reg_ht_get_byuser(&puri.user, (reg_use_domain)?&puri.host:NULL); + reg = reg_ht_get_byuser(&puri.user, (_uac_reg_use_domain)?&puri.host:NULL); if(reg==NULL) { LM_DBG("no user: %.*s\n", src->len, src->s); @@ -1673,7 +1673,7 @@ int uac_reg_status(struct sip_msg *msg, str *src, int mode) LM_ERR("failed to parse uri\n"); return -1; } - reg = reg_ht_get_byuser(&puri.user, (reg_use_domain)?&puri.host:NULL); + reg = reg_ht_get_byuser(&puri.user, (_uac_reg_use_domain)?&puri.host:NULL); if(reg==NULL) { LM_DBG("no user: %.*s\n", src->len, src->s); @@ -1717,7 +1717,7 @@ int uac_reg_request_to(struct sip_msg *msg, str *src, unsigned int mode) reg = reg_ht_get_byuuid(src); break; case 1: - if(reg_use_domain) + if(_uac_reg_use_domain) { if (parse_uri(src->s, src->len, &puri)!=0) {

2 years, 11 months

git:master:ea3ca819: uac: renamed parameter for kemi uac_reg_lookup_uri()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ea3ca819bc07fed6b40bd6cc8f6f147dac66d9ca URL: https://github.com/kamailio/kamailio/commit/ea3ca819bc07fed6b40bd6cc8f6f147… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-10T09:28:31+02:00 uac: renamed parameter for kemi uac_reg_lookup_uri() - be suggestive of its purpose in the index docs --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/ea3ca819bc07fed6b40bd6cc8f6f147… Patch: https://github.com/kamailio/kamailio/commit/ea3ca819bc07fed6b40bd6cc8f6f147… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index c7e181dc7c..46503bf592 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -684,7 +684,7 @@ static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst) return uac_reg_lookup(msg, &sval, dpv, 1); } -static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* userid, str* sdst) +static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* suri, str* sdst) { pv_spec_t *dpv = NULL; dpv = pv_cache_get(sdst); @@ -692,7 +692,7 @@ static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* userid, str* sdst) LM_ERR("cannot get pv spec for [%.*s]\n", sdst->len, sdst->s); return -1; } - return uac_reg_lookup(msg, userid, dpv, 1); + return uac_reg_lookup(msg, suri, dpv, 1); } static int w_uac_reg_status(struct sip_msg* msg, char* src, char* p2)

2 years, 11 months

[kamailio/kamailio] tspops: failed tcp_keepalive_enable (#2730)

by sergey-safarov

### Description Cannot use `tcp_keepalive_enable` function on master branch. #### Reproduction Create config file like ``` listen=udp:127.0.0.1:5060 loadmodule "pv.so" loadmodule "tcpops.so" #modparam("http_client", "httpcon", "http://example.com=>http://example.com"); request_route { tcp_keepalive_enable("22", "60", "5", "2"); } ``` and then start Kamailio #### Log Messages ``` [root@sbc-a0 config]# kamailio -ddd -DD -E -f /tmp/test.cfg 0(30164) INFO: <core> [main.c:2139]: main(): private (per process) memory: 8388608 bytes 0(30164) DEBUG: <core> [core/mem/q_malloc.c:199]: qm_malloc_init(): QM_OPTIMIZE=16384, /ROUNDTO=2048 0(30164) DEBUG: <core> [core/mem/q_malloc.c:201]: qm_malloc_init(): QM_HASH_SIZE=2099, qm_block size=235152 0(30164) DEBUG: <core> [core/mem/q_malloc.c:203]: qm_malloc_init(): qm_malloc_init(0xffff8d5c0010, 8388608), start=0xffff8d5c0010 0(30164) DEBUG: <core> [core/mem/q_malloc.c:212]: qm_malloc_init(): size= 8388608, init_overhead=235256 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: KAMAILIO_5 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: KAMAILIO_5_6 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: KAMAILIO_5_6_0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d60)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70da0)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d00)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d40)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d20)[0] to 0 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[0] to 0 0(30164) DEBUG: <core> [core/pvapi.c:2146]: pv_init_buffer(): PV print buffer initialized to [40][8192] 0(30164) DEBUG: <core> [main.c:2460]: main(): read 4025707099 from /dev/urandom 0(30164) DEBUG: <core> [main.c:2466]: main(): seeding PRNG with 1351243300 0(30164) DEBUG: <core> [core/rand/cryptorand.c:36]: cryptorand_seed(): seeding cryptorand generator with 1351243300 0(30164) DEBUG: <core> [core/rand/fortuna/random.c:154]: system_reseed(): cryptographic PRNG reseed done with 32 bytes 0(30164) DEBUG: <core> [core/rand/fortuna/random.c:175]: sr_add_entropy(): additional 4 bytes entropy added to cryptographic PRNG 0(30164) DEBUG: <core> [main.c:2471]: main(): test random numbers 1639832327 574986100 3505011376 2068663732 0(30164) DEBUG: <core> [core/cfg.y:1860]: yyparse(): loading module pv.so 0(30164) DEBUG: <core> [core/sr_module.c:510]: ksr_locate_module(): found module to load </usr/lib64/kamailio/modules/pv.so> 0(30164) DEBUG: <core> [core/sr_module.c:560]: load_module(): trying to load </usr/lib64/kamailio/modules/pv.so> 0(30164) DEBUG: <core> [core/kemi.c:3062]: sr_kemi_modules_add(): adding core module 0(30164) DEBUG: <core> [core/kemi.c:3066]: sr_kemi_modules_add(): adding pv module 0(30164) DEBUG: <core> [core/kemi.c:3070]: sr_kemi_modules_add(): adding hdr module 0(30164) DEBUG: <core> [core/kemi.c:3084]: sr_kemi_modules_add(): adding module: pvx 0(30164) DEBUG: <core> [core/sr_module.c:288]: register_module(): register PV from: pv 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: MOD_pv 0(30164) DEBUG: <core> [core/cfg.y:1860]: yyparse(): loading module tcpops.so 0(30164) DEBUG: <core> [core/sr_module.c:510]: ksr_locate_module(): found module to load </usr/lib64/kamailio/modules/tcpops.so> 0(30164) DEBUG: <core> [core/sr_module.c:560]: load_module(): trying to load </usr/lib64/kamailio/modules/tcpops.so> 0(30164) DEBUG: <core> [core/kemi.c:3084]: sr_kemi_modules_add(): adding module: tcpops 0(30164) DEBUG: <core> [core/sr_module.c:288]: register_module(): register PV from: tcpops 0(30164) DEBUG: <core> [core/cfg.lex:1964]: pp_define(): defining id: MOD_tcpops 0(30164) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type24, i/count 0/2: type 9(9)/ data (nil) 0(30164) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type24, i/count 1/2: type 3(3)/ data (nil) 0(30164) DEBUG: <core> [core/sr_module.c:710]: find_mod_export_record(): found export of <tcp_keepalive_enable> in module tcpops [/usr/lib64/kamailio/modules/tcpops.so] 0(30164) DEBUG: <core> [core/mem/shm.c:100]: shm_core_pools_init(): preparing to initialize shm core pools 0(30164) DEBUG: <core> [core/mem/q_malloc.c:199]: qm_malloc_init(): QM_OPTIMIZE=16384, /ROUNDTO=2048 0(30164) DEBUG: <core> [core/mem/q_malloc.c:201]: qm_malloc_init(): QM_HASH_SIZE=2099, qm_block size=235152 0(30164) DEBUG: <core> [core/mem/q_malloc.c:203]: qm_malloc_init(): qm_malloc_init(0xffff89470000, 67108864), start=0xffff89470000 0(30164) DEBUG: <core> [core/mem/q_malloc.c:212]: qm_malloc_init(): size= 67108864, init_overhead=235256 0(30164) DEBUG: <core> [core/ppcfg.c:233]: pp_ifdef_level_check(): same number of pairing preprocessor directives #!IF[N]DEF - #!ENDIF 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[core:receive-parse-error] to 1 0(30164) INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost.localdomain:5060) vs. (1:localhost:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4:5060) vs. (1:localhost.localdomain:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4:5060) vs. (1:localhost:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4.localdomain4:5060) vs. (1:localhost4:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4.localdomain4:5060) vs. (1:localhost.localdomain:5060) 0(30164) DEBUG: <core> [core/name_alias.h:62]: grep_aliases(): matching (1:localhost4.localdomain4:5060) vs. (1:localhost:5060) Listening on udp: 127.0.0.1:5060 Aliases: udp: localhost4.localdomain4:5060 udp: localhost4:5060 udp: localhost.localdomain:5060 udp: localhost:5060 0(30164) DEBUG: <core> [core/mem/pkg.c:108]: pkg_print_manager(): pkg - using memory manager: q_malloc 0(30164) DEBUG: <core> [core/mem/shm.c:300]: shm_print_manager(): shm - using memory manager: q_malloc 0(30164) DEBUG: <core> [core/cfg/cfg.c:173]: cfg_declare(): new config group has been registered: 'core' (num=57, size=228) 0(30164) DEBUG: <core> [core/cfg/cfg.c:173]: cfg_declare(): new config group has been registered: 'tcp' (num=27, size=108) 0(30164) DEBUG: <core> [core/timer.c:239]: init_timer(): starting with *ticks=1894875476 0(30164) DEBUG: <core> [core/timer.c:280]: init_timer(): timer_list between 0xffff894a9fd8 and 0xffff894edfd8 0(30164) DEBUG: <core> [core/pt.c:139]: register_procs(): registering new processes: 0 (old) + 1 (new) = 1 (total) 0(30164) INFO: <core> [core/tcp_main.c:4983]: init_tcp(): using epoll_lt as the io watch method (auto detected) 0(30164) DEBUG: <core> [core/daemonize.c:207]: enable_dumpable(): trying enable core dumping... 0(30164) DEBUG: <core> [core/daemonize.c:224]: enable_dumpable(): core dumping is enabled now (1)... 0(30164) DEBUG: <core> [core/daemonize.c:583]: set_core_dump(): core dump limits set to 18446744073709551615 0(30164) DEBUG: <core> [core/async_task.c:137]: async_task_init(): start initializing asynk task framework 0(30164) DEBUG: <core> [core/sr_module.c:931]: init_mod(): pv 0(30164) DEBUG: <core> [core/sr_module.c:931]: init_mod(): tcpops 0(30164) DEBUG: tcpops [tcpops_mod.c:137]: mod_init(): TCP keepalive module loaded. 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[tcp:closed] to 2 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[tcp:timeout] to 3 0(30164) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xa70d80)[tcp:reset] to 4 0(30164) DEBUG: <core> [core/pt.c:100]: init_pt(): registering new processes: 1 (old) + 12 (new) = 13 (total) 0(30164) INFO: <core> [main.c:3030]: main(): processes (at least): 13 - shm size: 67108864 - pkg size: 8388608 0(30164) DEBUG: <core> [core/route.c:885]: fix_actions(): fixing tcp_keepalive_enable() 0(30164) ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/tmp/test.cfg:9 error -1 while trying to fix configuration 0(30164) DEBUG: <core> [core/sr_module.c:823]: destroy_modules(): starting modules destroy phase 0(30164) DEBUG: tcpops [tcpops_mod.c:171]: mod_destroy(): TCP keepalive module unloaded. 0(30164) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized 0(30164) DEBUG: <core> [core/mem/shm.c:288]: shm_destroy_manager(): destroying memory manager: q_malloc 0(30164) DEBUG: <core> [core/mem/q_malloc.c:1186]: qm_shm_lock_destroy(): destroying the shared memory lock 0(30164) DEBUG: <core> [core/mem/pkg.c:97]: pkg_destroy_manager(): destroying memory manager: q_malloc ``` ### Additional Information current master on CentOS8 -- 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/2730

2 years, 11 months

git:master:02240711: tcpops: use fixup_igp_all() instead of fixup_igp_null()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 02240711239149e2f5c4890a70ab158d10fa8187 URL: https://github.com/kamailio/kamailio/commit/02240711239149e2f5c4890a70ab158… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-08T23:30:22+02:00 tcpops: use fixup_igp_all() instead of fixup_igp_null() - needed for functions with many parameters --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/02240711239149e2f5c4890a70ab158… Patch: https://github.com/kamailio/kamailio/commit/02240711239149e2f5c4890a70ab158… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index b2d2fbe7dd..23036fd771 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -78,27 +78,27 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable4, 4, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_keepalive_enable", (cmd_function)w_tcp_keepalive_enable3, 3, - fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable1, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_keepalive_disable", (cmd_function)w_tcp_keepalive_disable0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime2, 2, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_connection_lifetime", (cmd_function)w_tcpops_set_connection_lifetime1, 1, - fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event1, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_enable_closed_event", (cmd_function)w_tcpops_enable_closed_event0, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_conid_state", (cmd_function)w_tcp_conid_state, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_get_conid", (cmd_function)w_tcp_get_conid, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, - fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid", (cmd_function)w_tcp_set_otcpid, 1, fixup_igp_all, fixup_free_igp_all, ANY_ROUTE}, {"tcp_set_otcpid_flag", (cmd_function)w_tcp_set_otcpid_flag, 1,

2 years, 12 months

[kamailio/kamailio] lost: dynamic HELD url resolving (#2574)

by sergey-safarov

### Description According to design logic HELD request need to send a carrier LIS server. Now lost module sends this request to the preconfigured server via `http_client/httpcon` param. I prefer to use dynamic LIS server discovery according to [rfc7216#section-4](https://tools.ietf.org/html/rfc7216#section-4) and [rfc5986#section-4](https://tools.ietf.org/html/rfc5986#section-4). So dynamic LIS discovery works as: 1. Kamailio send reverse `.in-addr.arpa.` or `.ip6.arpa.` DNS request and caller host DNS name; 2. Kamailio send `LIS:HELD` NAPTR request for a resolved caller hostname and LIS server. 3. Kamailio send HELD request for resolved LIS address. So do get working dynamic LIS discovery required to implement two DNS requests. If any DNS request will fail, then `lost_held_query` function returns an error code. To define required dynamic LIS discovery I suggest use an empty string ("") or NULL value ($null) as the first ("con") function param. This feature request for discussion with lost module author (Wolfgang Kampichler @wkampich) and other interest devs. The ticket may be closed at any time. -- 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/2574

2 years, 12 months

git:master:22f0d9e1: modules: readme files regenerated - uac ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 22f0d9e11002f9eb8c33a765a6ae14739a01ec7f URL: https://github.com/kamailio/kamailio/commit/22f0d9e11002f9eb8c33a765a6ae147… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-05-07T08:16:20+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/22f0d9e11002f9eb8c33a765a6ae147… Patch: https://github.com/kamailio/kamailio/commit/22f0d9e11002f9eb8c33a765a6ae147…

2 years, 12 months

[kamailio/kamailio] username based lookup in uac_reg_lookup (#2714)

by Surendra Tiwari

### Description Currently uac_reg_lookup don't have provision to pass the mode parameter but its implement in core fuction: https://github.com/kamailio/kamailio/blob/951c9ac9adaccc1c35e152593cb3c2e7f… This should be imported to kemi as well as cfg function.  ### Expected behavior lookup in uacreg should be supported using username based also, currently uuid based support is only there. #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` 5.4.5 ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2714

2 years, 12 months

git:master:624da2b7: uac: docs for uac_reg_lookup_uri()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 624da2b7deb2539064be70a7566783fd36a15886 URL: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-07T08:09:11+02:00 uac: docs for uac_reg_lookup_uri() --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… Patch: https://github.com/kamailio/kamailio/commit/624da2b7deb2539064be70a7566783f… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 352d038ea2..52362af1e3 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1005,6 +1005,31 @@ if(uac_reg_lookup("$rU", "$ru")) { lookup("location"); } +... + </programlisting> + </example> + </section> + <section id="uac.f.uac_reg_lookup_uri"> + <title> + <function moreinfo="none">uac_reg_lookup_uri(uri, dst)</function> + </title> + <para> + This function sets the PV dst to SIP URI that correspond to the URI user + in uac registrations table. The uri can contain pseudo-variables and + dst must be the name of a pseudo-variable. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>uac_reg_lookup_uri</function> usage</title> + <programlisting format="linespecific"> +... + +if(uac_reg_lookup("$var(uri)", "$ru")) +{ + lookup("location"); +} ... </programlisting> </example>

2 years, 12 months

git:master:7cee6518: uac: added uac_reg_lookup_uri() - do lookup for user in the uri

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7cee6518421ed16b715d32a8b2ff6d222eac038b URL: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-05-07T08:00:34+02:00 uac: added uac_reg_lookup_uri() - do lookup for user in the uri --- Modified: src/modules/uac/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… Patch: https://github.com/kamailio/kamailio/commit/7cee6518421ed16b715d32a8b2ff6d2… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 5f0a3ad635..c7e181dc7c 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -102,6 +102,7 @@ static int w_restore_to(struct sip_msg* msg, char* p1, char* p2); static int w_uac_auth(struct sip_msg* msg, char* str, char* str2); static int w_uac_auth_mode(struct sip_msg* msg, char* pmode, char* str2); static int w_uac_reg_lookup(struct sip_msg* msg, char* src, char* dst); +static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst); 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); @@ -142,6 +143,8 @@ static cmd_export_t cmds[]={ {"uac_req_send", (cmd_function)w_uac_req_send, 0, 0, 0, ANY_ROUTE}, {"uac_reg_lookup", (cmd_function)w_uac_reg_lookup, 2, fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE }, + {"uac_reg_lookup_uri", (cmd_function)w_uac_reg_lookup_uri, 2, fixup_spve_pvar, + fixup_free_spve_pvar, ANY_ROUTE }, {"uac_reg_status", (cmd_function)w_uac_reg_status, 1, fixup_spve_null, 0, ANY_ROUTE }, {"uac_reg_request_to", (cmd_function)w_uac_reg_request_to, 2, @@ -666,6 +669,32 @@ static int ki_uac_reg_lookup(sip_msg_t* msg, str* userid, str* sdst) return uac_reg_lookup(msg, userid, dpv, 0); } +static int w_uac_reg_lookup_uri(struct sip_msg* msg, char* src, char* dst) +{ + pv_spec_t *dpv; + str sval; + + if(fixup_get_svalue(msg, (gparam_t*)src, &sval)<0) { + LM_ERR("cannot get the uuid parameter\n"); + return -1; + } + + dpv = (pv_spec_t*)dst; + + return uac_reg_lookup(msg, &sval, dpv, 1); +} + +static int ki_uac_reg_lookup_uri(sip_msg_t* msg, str* userid, str* sdst) +{ + pv_spec_t *dpv = NULL; + dpv = pv_cache_get(sdst); + if(dpv==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", sdst->len, sdst->s); + return -1; + } + return uac_reg_lookup(msg, userid, dpv, 1); +} + static int w_uac_reg_status(struct sip_msg* msg, char* src, char* p2) { str sval; @@ -827,6 +856,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_lookup_uri"), + SR_KEMIP_INT, ki_uac_reg_lookup_uri, + { 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_status"), SR_KEMIP_INT, ki_uac_reg_status, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

2 years, 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 2021