sr-dev February 2023

sr-dev@lists.kamailio.org

10 participants
296 discussions

git:master:ff106fb9: nathelper: docs - updates to the nat pinging types

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ff106fb93c5b872e529106f58a1b42c4fa092349 URL: https://github.com/kamailio/kamailio/commit/ff106fb93c5b872e529106f58a1b42c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T13:02:35+01:00 nathelper: docs - updates to the nat pinging types --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ff106fb93c5b872e529106f58a1b42c… Patch: https://github.com/kamailio/kamailio/commit/ff106fb93c5b872e529106f58a1b42c…

1 year, 9 months

git:master:fdf72bec: modules: readme files regenerated - nathelper ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: fdf72bec2d6cc20618bc30d0978d7f24f8106d44 URL: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T13:01:34+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2… Patch: https://github.com/kamailio/kamailio/commit/fdf72bec2d6cc20618bc30d0978d7f2… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index e091d2018f..941cee9465 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -107,7 +107,7 @@ Ovidiu Sas 1.17. Set alias_name parameter 1.18. fix_nated_contact usage 1.19. fix_nated_sdp usage - 1.20. add_rcv_paramer usage + 1.20. add_rcv_param usage 1.21. fix_nated_register usage 1.22. nat_uac_test usage 1.23. is_rfc1918 usage @@ -187,10 +187,10 @@ Chapter 1. Admin Guide with request's source address:port pair. The function fix_nated_sdp() adds the active direction indication to SDP (flag 0x01) and updates the source IP address too (flag 0x02). The function fix_nated_register() - exports exports the request's source address:port into an AVP to be - used during save() and should be used for ��REGISTER�� requests. + exports the request's source address:port into an AVP to be used during + save() and should be used for ��REGISTER�� requests. - Note: fix_nated_contact changes the ��Contact�� header, thus it breaks + Note: fix_nated_contact() changes the ��Contact�� header, thus it breaks the RFC. Although usually this is not an issue, it may cause problems with strict SIP clients. An alternative is to use add_contact_alias() that together with the handle_ruri_alias() is standards conforming and @@ -205,7 +205,7 @@ Chapter 1. Admin Guide Kamailio; + Disadvantages: unidirectional traffic through NAT (inbound - from outside to inside); As many NATs do update the bind - timeout only on outbound traffic, the bind may expire and + timeout only on outbound traffic, the bind may expire and get closed. * SIP request - a stateless SIP request is sent to the UDP contact address. @@ -285,7 +285,8 @@ modparam("nathelper", "natping_interval", 10) 4.3. ping_nated_only (integer) If this parameter is set to 1 then only contacts that have the behind - NAT ��nat_bflag�� flag in user location database set will get ping. + NAT ��nat_bflag�� flag in user location database set will get + SIP-request-based ping. If it is 0 and sipping_bflag is not set, then the 4-bytes UDP ping is sent to all contacts. If it is 0 and sipping_bflag parameter is set, @@ -583,7 +584,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; This function can be used from REQUEST_ROUTE. - Example 1.20. add_rcv_paramer usage + Example 1.20. add_rcv_param usage ... add_rcv_param(); # add the parameter to the Contact header .... @@ -821,7 +822,7 @@ $ kamcmd nathelper.enable_ping 1 8.1. @nathelper.rewrite_contact[n] Get n-th Contact value with IP:Port rewritten to source ip:port. N is - counted from 1. Only IP:port is rewritten, remaining part are left + counted from 1. Only IP:port is rewritten, remaining parts are left unchanged. Full nameaddr is supported. Example 1.31. @nathelper.rewrite_contact usage

1 year, 9 months

git:master:8218c14d: nathelper: ping_nated_only sends 4-bytes UDP-packet pings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8218c14d144ef4539c94c8aabe5e73b5c8a11b08 URL: https://github.com/kamailio/kamailio/commit/8218c14d144ef4539c94c8aabe5e73b… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:48:02+01:00 nathelper: ping_nated_only sends 4-bytes UDP-packet pings --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/examples/4to6.cfg Modified: src/modules/nathelper/examples/alg.cfg Modified: src/modules/nathelper/nathelper.c Modified: src/modules/nathelper/nhelpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/8218c14d144ef4539c94c8aabe5e73b… Patch: https://github.com/kamailio/kamailio/commit/8218c14d144ef4539c94c8aabe5e73b…

1 year, 9 months

git:master:d81e26fb: modules: readme files regenerated - dmq_usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d81e26fb399c5fadda2d70de1d95e008d47bd3d5 URL: https://github.com/kamailio/kamailio/commit/d81e26fb399c5fadda2d70de1d95e00… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T12:31:34+01:00 modules: readme files regenerated - dmq_usrloc ... [skip ci] --- Modified: src/modules/dmq_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/d81e26fb399c5fadda2d70de1d95e00… Patch: https://github.com/kamailio/kamailio/commit/d81e26fb399c5fadda2d70de1d95e00… --- diff --git a/src/modules/dmq_usrloc/README b/src/modules/dmq_usrloc/README index 1536fd5f85..d179d1cfa1 100644 --- a/src/modules/dmq_usrloc/README +++ b/src/modules/dmq_usrloc/README @@ -224,13 +224,14 @@ modparam("dmq_usrloc", "usrloc_domain", "my_domain") The parameter controls whether the socket replication is active or not. This is important for anycast scenarios. The value can be: * 0 - disabled - * 1 - enabled + * 1 - enabled, replicate socket by proto:host:port + * 2 - enabled, replicate socket by socket name Default value is 0. Example 1.8. Set replicate_socket_info parameter ... -modparam("dmq_usrloc", "replicate_socket_info", 0) +modparam("dmq_usrloc", "replicate_socket_info", 1) ... 3.9. usrloc_delete (int)

1 year, 9 months

git:5.5:05ea1752: usrloc: correct AOR value on usrloc:contact-expired

by Victor Seva

Module: kamailio Branch: 5.5 Commit: 05ea1752c9f941b624ce5f0b8f4e94d5e81195b2 URL: https://github.com/kamailio/kamailio/commit/05ea1752c9f941b624ce5f0b8f4e94d… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-13T12:27:10+01:00 usrloc: correct AOR value on usrloc:contact-expired previously $ulc(x=>aor) had only the user part even with use_domain set fix #3365 (cherry picked from commit f3d00c91a7919207dac23ada58e59a13b9f334d8) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/05ea1752c9f941b624ce5f0b8f4e94d… Patch: https://github.com/kamailio/kamailio/commit/05ea1752c9f941b624ce5f0b8f4e94d… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 204ddfd29f..534583e018 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -905,7 +905,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) db_val_t query_vals[3]; int key_num = 2; db1_res_t* res = NULL; - str user, contact; + str user, contact, domain; int i; int n; urecord_t r; @@ -913,6 +913,9 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; str ruid; +#define AORBUF_SIZE 512 + char aorbuf[AORBUF_SIZE]; + str aor; if (ul_db_mode!=DB_ONLY) { return 0; @@ -1007,6 +1010,14 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } user.len = strlen(user.s); + if(user.len < AORBUF_SIZE ) { + memcpy(aorbuf, user.s, user.len); + aor.s = aorbuf; + aor.len = user.len; + } else { + LM_ERR("user is too long %d\n", user.len); + continue; + } ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { @@ -1015,18 +1026,30 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } - lock_udomain(_d, &user); + if(ul_use_domain) { + domain.s = (char*)VAL_STRING(ROW_VALUES(row)+20); + domain.len = strlen(domain.s); + if(domain.len + aor.len < AORBUF_SIZE) { + aorbuf[aor.len] = '@'; + memcpy(aorbuf+aor.len+1, domain.s, domain.len); + aor.len += domain.len + 1; + } else { + LM_ERR("aor too long, using user part only\n"); + } + } + + lock_udomain(_d, &aor); /* don't use the same static value from get_static_urecord() */ memset( &r, 0, sizeof(struct urecord) ); - r.aor = user; - r.aorhash = ul_get_aorhash(&user); + r.aor = aor; + r.aorhash = ul_get_aorhash(&aor); r.domain = _d->name; if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", - user.len, user.s); + aor.len, aor.s); release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); goto error; } @@ -1045,11 +1068,11 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) ruid.len = c->ruid.len; } else { LM_ERR("ruid is too long %d for %.*s\n", c->ruid.len, - user.len, user.s); + aor.len, aor.s); } } release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */ uldb_delete_attrs_ruid(_d->name, &ruid);

1 year, 9 months

git:5.6:baa91762: usrloc: correct AOR value on usrloc:contact-expired

by Victor Seva

Module: kamailio Branch: 5.6 Commit: baa91762aa9f5ee6ede385148c6302c14537cd15 URL: https://github.com/kamailio/kamailio/commit/baa91762aa9f5ee6ede385148c6302c… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-13T12:26:38+01:00 usrloc: correct AOR value on usrloc:contact-expired previously $ulc(x=>aor) had only the user part even with use_domain set fix #3365 (cherry picked from commit f3d00c91a7919207dac23ada58e59a13b9f334d8) --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/baa91762aa9f5ee6ede385148c6302c… Patch: https://github.com/kamailio/kamailio/commit/baa91762aa9f5ee6ede385148c6302c… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 4025cc549e..d7b9e8a3e5 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -956,7 +956,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) db_val_t query_vals[3]; int key_num = 2; db1_res_t* res = NULL; - str user, contact; + str user, contact, domain; int i; int n; urecord_t r; @@ -964,6 +964,9 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; str ruid; +#define AORBUF_SIZE 512 + char aorbuf[AORBUF_SIZE]; + str aor; if (ul_db_mode!=DB_ONLY) { return 0; @@ -1058,6 +1061,14 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } user.len = strlen(user.s); + if(user.len < AORBUF_SIZE ) { + memcpy(aorbuf, user.s, user.len); + aor.s = aorbuf; + aor.len = user.len; + } else { + LM_ERR("user is too long %d\n", user.len); + continue; + } ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { @@ -1066,18 +1077,30 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } - lock_udomain(_d, &user); + if(ul_use_domain) { + domain.s = (char*)VAL_STRING(ROW_VALUES(row)+20); + domain.len = strlen(domain.s); + if(domain.len + aor.len < AORBUF_SIZE) { + aorbuf[aor.len] = '@'; + memcpy(aorbuf+aor.len+1, domain.s, domain.len); + aor.len += domain.len + 1; + } else { + LM_ERR("aor too long, using user part only\n"); + } + } + + lock_udomain(_d, &aor); /* don't use the same static value from get_static_urecord() */ memset( &r, 0, sizeof(struct urecord) ); - r.aor = user; - r.aorhash = ul_get_aorhash(&user); + r.aor = aor; + r.aorhash = ul_get_aorhash(&aor); r.domain = _d->name; if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", - user.len, user.s); + aor.len, aor.s); release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); goto error; } @@ -1096,11 +1119,11 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) ruid.len = c->ruid.len; } else { LM_ERR("ruid is too long %d for %.*s\n", c->ruid.len, - user.len, user.s); + aor.len, aor.s); } } release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */ uldb_delete_attrs_ruid(_d->name, &ruid);

1 year, 9 months

[kamailio/kamailio] AOR value at event_route[usrloc:contact-expired] has no domain part even with usrloc.use_domain == 1 (Issue #3365)

by Victor Seva

### Description When event_route[usrloc:contact-expired] is triggered, the pseudo-var $ulc(exp=>aor) contains only the userpart of the aor of the expired registration ### Troubleshooting ``` modparam("usrloc", "use_domain", 1) [...] event_route[usrloc:contact-expired] { xlog("L_NOTICE", "Contact ruid $ulc(exp=>ruid) to $ulc(exp=>addr) for user $ulc(exp=>aor) expired\n"); } ``` #### Log Messages REGISTER... AOR is ``43991002(a)ce-trunk.lab`` ``` │Feb 9 16:19:47.152646 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE usrloc [udomain.c:697]: db_load_urecord(): aor 43991002(a)ce-trunk.lab not found in table location │Feb 9 16:19:47.152816 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [path.c:108]: build_path_vector(): received is <sip:192.168.2.177:5160> │Feb 9 16:19:47.152843 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [path.c:116]: build_path_vector(): path is <<sip:lb@127.0.0.1;lr;received=sip:192.168.2.177:5160;socket=sip:192.168.2.70:5060>> │Feb 9 16:19:47.152866 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [save.c:421]: pack_ci(): generated ruid is: uloc-63e50ec8-580d-1 │Feb 9 16:19:47.154051 spce proxy[22541]: DEBUG: ROUTE_REG_HANDLE registrar [reply.c:334]: build_contact(): created Contact HF: Contact: <sip:43991002@192.168.2.177:5160>;expires=600;received="sip:192.168.2.177:5160"#015#012 │Feb 9 16:19:47.154354 spce proxy[22541]: NOTICE: ROUTE_REG_HANDLE <script>: Contacts successfully saved, expires in 600s - R=«sip:ce-trunk.lab» ID=«pgflewbuqnvhmid(a)debbox.xn--lab-3ga UA='Twinkle/1.10.2' ``` let it expire.. AOR in event_route[usrloc:contact-expired] is ``43991002`` ``` │Feb 9 16:30:32.980631 spce proxy[22543]: DEBUG: usrloc [udomain.c:1050]: udomain_contact_expired_cb(): calling contact expired records - cycle [1] │Feb 9 16:30:32.980655 spce proxy[22543]: DEBUG: usrloc [ul_callback.h:83]: run_ul_callbacks(): contact=0x7f434b8a1220, callback type 8/8, id 0 entered │Feb 9 16:30:32.980776 spce proxy[22543]: DEBUG: registrar [regpv.c:734]: reg_ul_expired_contact(): saved contact for <43991002> in [exp] │Feb 9 16:30:32.980799 spce proxy[22543]: NOTICE: usrloc:contact-expired <script>: Contact ruid uloc-63e50ec8-580d-1 to sip:43991002@192.168.2.177:5160 for user 43991002 expired ``` ### Possible Solutions PR will follow with possible solution ### Additional Information * **Kamailio Version** - output of `kamailio -v` This is kamailio Sipwise flavor ``` version: kamailio 5.6.2 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3365 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3365(a)github.com>

1 year, 9 months

[kamailio/kamailio] usrloc: correct AOR value on usrloc:contact-expired (PR #3366)

by Victor Seva

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3365 #### Description previously $ulc(x=>aor) had only the user part even with use_domain set output after applied the fix ``` │Feb 9 16:47:58.089067 spce proxy[30268]: DEBUG: usrloc [udomain.c:1053]: udomain_contact_expired_cb(): calling contact expired records - cycle [1] │Feb 9 16:47:58.089100 spce proxy[30268]: DEBUG: usrloc [ul_callback.h:83]: run_ul_callbacks(): contact=0x7f8859ed4f50, callback type 8/8, id 0 entered │Feb 9 16:47:58.089197 spce proxy[30268]: DEBUG: registrar [regpv.c:734]: reg_ul_expired_contact(): saved contact for <43991002(a)ce-trunk.lab> in [exp] │Feb 9 16:47:58.089220 spce proxy[30268]: NOTICE: usrloc:contact-expired <script>: Contact ruid uloc-63e5131a-7639-1 to sip:43991002@192.168.2.177:5160 for user 43991002(a)ce-trunk.lab expired ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3366 -- Commit Summary -- * usrloc: correct AOR value on usrloc:contact-expired -- File Changes -- M src/modules/usrloc/udomain.c (39) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3366.patch https://github.com/kamailio/kamailio/pull/3366.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3366 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3366(a)github.com>

1 year, 9 months

git:master:f3d00c91: usrloc: correct AOR value on usrloc:contact-expired

by Victor Seva

Module: kamailio Branch: master Commit: f3d00c91a7919207dac23ada58e59a13b9f334d8 URL: https://github.com/kamailio/kamailio/commit/f3d00c91a7919207dac23ada58e59a1… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-02-13T12:24:30+01:00 usrloc: correct AOR value on usrloc:contact-expired previously $ulc(x=>aor) had only the user part even with use_domain set fix #3365 --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/f3d00c91a7919207dac23ada58e59a1… Patch: https://github.com/kamailio/kamailio/commit/f3d00c91a7919207dac23ada58e59a1… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index f64df09daa..1d30d813bd 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -955,7 +955,7 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) db_val_t query_vals[3]; int key_num = 2; db1_res_t* res = NULL; - str user, contact; + str user, contact, domain; int i; int n; urecord_t r; @@ -963,6 +963,9 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) #define RUIDBUF_SIZE 128 char ruidbuf[RUIDBUF_SIZE]; str ruid; +#define AORBUF_SIZE 512 + char aorbuf[AORBUF_SIZE]; + str aor; if (ul_db_mode!=DB_ONLY) { return 0; @@ -1057,6 +1060,14 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } user.len = strlen(user.s); + if(user.len < AORBUF_SIZE ) { + memcpy(aorbuf, user.s, user.len); + aor.s = aorbuf; + aor.len = user.len; + } else { + LM_ERR("user is too long %d\n", user.len); + continue; + } ci = dbrow2info(ROW_VALUES(row)+1, &contact, 0); if (ci==0) { @@ -1065,18 +1076,30 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) continue; } - lock_udomain(_d, &user); + if(ul_use_domain) { + domain.s = (char*)VAL_STRING(ROW_VALUES(row)+20); + domain.len = strlen(domain.s); + if(domain.len + aor.len < AORBUF_SIZE) { + aorbuf[aor.len] = '@'; + memcpy(aorbuf+aor.len+1, domain.s, domain.len); + aor.len += domain.len + 1; + } else { + LM_ERR("aor too long, using user part only\n"); + } + } + + lock_udomain(_d, &aor); /* don't use the same static value from get_static_urecord() */ memset( &r, 0, sizeof(struct urecord) ); - r.aor = user; - r.aorhash = ul_get_aorhash(&user); + r.aor = aor; + r.aorhash = ul_get_aorhash(&aor); r.domain = _d->name; if ( (c=mem_insert_ucontact(&r, &contact, ci)) == 0) { LM_ERR("inserting temporary contact failed for %.*s\n", - user.len, user.s); + aor.len, aor.s); release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); goto error; } @@ -1095,11 +1118,11 @@ int udomain_contact_expired_cb(db1_con_t* _c, udomain_t* _d) ruid.len = c->ruid.len; } else { LM_ERR("ruid is too long %d for %.*s\n", c->ruid.len, - user.len, user.s); + aor.len, aor.s); } } release_urecord(&r); - unlock_udomain(_d, &user); + unlock_udomain(_d, &aor); if(ruid.len > 0 && ul_xavp_contact_name.s != NULL) { /* delete attributes by ruid */ uldb_delete_attrs_ruid(_d->name, &ruid);

1 year, 9 months

git:master:d2e73f9c: dmq_usrloc: check if socket name is set when replicating

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d2e73f9c51630f47fa7660b4c4831fcecd661f87 URL: https://github.com/kamailio/kamailio/commit/d2e73f9c51630f47fa7660b4c4831fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:20:37+01:00 dmq_usrloc: check if socket name is set when replicating --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/d2e73f9c51630f47fa7660b4c4831fc… Patch: https://github.com/kamailio/kamailio/commit/d2e73f9c51630f47fa7660b4c4831fc… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index dd2a7f2f42..62477198a2 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -692,7 +692,7 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor, int action, dmq_node srjson_AddStrToObject(jdoc, jdoc_contact, "sock", ptr->sock->sock_str.s, ptr->sock->sock_str.len); jdoc_contact_group.size += ptr->sock->sock_str.len; } - else if (_dmq_usrloc_replicate_socket_info==DMQ_USRLOC_REPLICATE_SOCKNAME) { + else if (_dmq_usrloc_replicate_socket_info==DMQ_USRLOC_REPLICATE_SOCKNAME && ptr->sock!=NULL && ptr->sock->sockname.s!=NULL) { srjson_AddStrToObject(jdoc, jdoc_contact, "sockname", ptr->sock->sockname.s, ptr->sock->sockname.len); jdoc_contact_group.size += ptr->sock->sockname.len; }

1 year, 9 months

← Newer
1
...
17
18
19
20
21
22
23
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2023