sr-dev April 2022

sr-dev@lists.kamailio.org

17 participants
283 discussions

git:master:313c0a93: core: helper function to get socket by advertise address

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 313c0a93ad2076a2eac88c95d8992c42975a36cf URL: https://github.com/kamailio/kamailio/commit/313c0a93ad2076a2eac88c95d8992c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T12:38:27+02:00 core: helper function to get socket by advertise address --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/313c0a93ad2076a2eac88c95d8992c4… Patch: https://github.com/kamailio/kamailio/commit/313c0a93ad2076a2eac88c95d8992c4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 2b29d2b95c..5622e2634d 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -878,6 +878,40 @@ socket_info_t* ksr_get_socket_by_listen(str *sockstr) return NULL; } +socket_info_t* ksr_get_socket_by_advertise(str *sockstr) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(si->useinfo.sock_str.s == NULL) { + continue; + } + LM_DBG("checking if listen %.*s matches %.*s\n", + sockstr->len, sockstr->s, + si->useinfo.sock_str.len, si->useinfo.sock_str.s); + if (sockstr->len == si->useinfo.sock_str.len + && strncasecmp(sockstr->s, si->useinfo.sock_str.s, + sockstr->len)==0) { + return si; + } + } + } while((c_proto = next_proto(c_proto))!=0); + + return NULL; +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 0b517de2de..3c8deeb244 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -105,6 +105,7 @@ struct socket_info* find_si(struct ip_addr* ip, unsigned short port, unsigned short proto); socket_info_t* ksr_get_socket_by_name(str *sockname); socket_info_t* ksr_get_socket_by_listen(str *sockstr); +socket_info_t* ksr_get_socket_by_advertise(str *sockstr); struct socket_info** get_sock_info_list(unsigned short proto);

2 years

git:master:e272eea0: permissions: return ret variable set inside double_fixup()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e272eea0229678b4446a3907b7360c61c273caa7 URL: https://github.com/kamailio/kamailio/commit/e272eea0229678b4446a3907b7360c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T12:36:49+02:00 permissions: return ret variable set inside double_fixup() --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/e272eea0229678b4446a3907b7360c6… Patch: https://github.com/kamailio/kamailio/commit/e272eea0229678b4446a3907b7360c6… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index d5655206e4..6f1b36cf23 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -548,7 +548,7 @@ static int double_fixup(void** param, int param_no) *param = tmp; pkg_free(buffer); - return 0; + return ret; } else if (param_no == 2) { /* pseudo variable */

2 years

git:master:d4d20240: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d4d20240d5ef55a55b2ddd37ae926124d9919623 URL: https://github.com/kamailio/kamailio/commit/d4d20240d5ef55a55b2ddd37ae92612… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-07T20:16:16+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/d4d20240d5ef55a55b2ddd37ae92612… Patch: https://github.com/kamailio/kamailio/commit/d4d20240d5ef55a55b2ddd37ae92612…

2 years

git:master:168b7653: p_usrloc: add a note to docs about runtime change of UTC parameter, related to gh #3072

by Henning Westerholt

Module: kamailio Branch: master Commit: 168b76538c33be5a91d73d553930c60229e72c1f URL: https://github.com/kamailio/kamailio/commit/168b76538c33be5a91d73d553930c60… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-07T18:14:10Z p_usrloc: add a note to docs about runtime change of UTC parameter, related to gh #3072 --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/168b76538c33be5a91d73d553930c60… Patch: https://github.com/kamailio/kamailio/commit/168b76538c33be5a91d73d553930c60… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index 2cd04221b5..ca8faa827f 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -761,7 +761,7 @@ kamcmd cfg.get p_usrloc matching_mode <title><varname>UTC_timestamps</varname>(int)</title> <para> <emphasis> - Enables UTC timestamps for expires and last_modified columns. + Enables UTC timestamps for expires and last_modified columns. It can be changed at runtime via rpc command. </emphasis> </para> <para>

2 years

git:master:a3ca4237: dispatcher: docs for ds_dns_mode and ds_dns_interval

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a3ca4237f3514da99d9fb1095b82a76740ebd108 URL: https://github.com/kamailio/kamailio/commit/a3ca4237f3514da99d9fb1095b82a76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T20:13:27+02:00 dispatcher: docs for ds_dns_mode and ds_dns_interval --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a3ca4237f3514da99d9fb1095b82a76… Patch: https://github.com/kamailio/kamailio/commit/a3ca4237f3514da99d9fb1095b82a76… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 6075d110fe..23dcb513e6 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1100,6 +1100,68 @@ modparam("dispatcher", "reload_delta", 1) </programlisting> </example> </section> + + <section id="dispatcher.p.ds_dns_mode"> + <title><varname>ds_dns_mode</varname> (int)</title> + <para> + Specify the how DNS resolving is done for destination addresses. + </para> + <para> + It is a bitwise flag and can be set to one or the sum of: + </para> + <itemizedlist> + <listitem> + <para>1 - do it at startup and reload (previous behaviour).</para> + </listitem> + <listitem> + <para>2 - do it always when the address is matched with ds_is_from_list().</para> + </listitem> + <listitem> + <para>4 - do it startup/reload and refresh on the timer interval + specified by ds_dns_interval.</para> + </listitem> + <listitem> + <para>8 - do SRV (and NAPTR if enabled in core) query instead of + A/AAAA lookup. NAPTR is done if protocol and port are not set. + SRV is done if port is not set.</para> + </listitem> + </itemizedlist> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_dns_mode</quote> parameter</title> +<programlisting format="linespecific"> +... +modparam("dispatcher", "ds_dns_mode", 2) +... +</programlisting> + </example> + </section> + + <section id="dispatcher.p.ds_dns_interval"> + <title><varname>ds_dns_interval</varname> (int)</title> + <para> + The interval in seconds to periodically refresh the DNS queries for + destination addresses if ds_dns_mode has value 4 set. + </para> + <para> + <emphasis> + Default value is <quote>600</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_dns_interval</quote> parameter</title> +<programlisting format="linespecific"> +... +modparam("dispatcher", "ds_interval_mode", 1800) +... +</programlisting> + </example> + </section> + </section> <section>

2 years

git:master:fd0794bc: dispatcher: set default value for ds_dns_interval to 600

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fd0794bc87c15d04c78c5bf2f23a8afc550b24eb URL: https://github.com/kamailio/kamailio/commit/fd0794bc87c15d04c78c5bf2f23a8af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T20:13:27+02:00 dispatcher: set default value for ds_dns_interval to 600 - use modparam value for ds_dns_mode --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/fd0794bc87c15d04c78c5bf2f23a8af… Patch: https://github.com/kamailio/kamailio/commit/fd0794bc87c15d04c78c5bf2f23a8af… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 471070fe4e..e877e3bf6c 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -121,8 +121,7 @@ int ds_timer_mode = 0; int ds_attrs_none = 0; int ds_load_mode = 0; uint32_t ds_dns_mode = DS_DNS_MODE_INIT; -static int ds_dns_mode_param = 0; -static int ds_dns_interval = 0; +static int ds_dns_interval = 600; str ds_outbound_proxy = STR_NULL; @@ -299,7 +298,7 @@ static param_export_t params[]={ {"ds_db_extra_attrs", PARAM_STR, &ds_db_extra_attrs}, {"ds_load_mode", PARAM_INT, &ds_load_mode}, {"reload_delta", PARAM_INT, &ds_reload_delta }, - {"ds_dns_mode", PARAM_INT, &ds_dns_mode_param}, + {"ds_dns_mode", PARAM_INT, &ds_dns_mode}, {"ds_dns_interval", PARAM_INT, &ds_dns_interval}, {0,0,0} }; @@ -330,8 +329,6 @@ static int mod_init(void) param_hooks_t phooks; param_t *pit = NULL; - ds_dns_mode = 1U<<(unsigned int)ds_dns_mode_param; - if(ds_dns_mode & DS_DNS_MODE_TIMER) { if(ds_dns_interval<=0) { LM_WARN("dns interval parameter not set - using 600\n");

2 years

git:master:fa0e1684: dispatcher: dns resolving of destination addresses done on timer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fa0e1684a39a505abf95e0fa202907ceb7d3ff3e URL: https://github.com/kamailio/kamailio/commit/fa0e1684a39a505abf95e0fa202907c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T20:13:27+02:00 dispatcher: dns resolving of destination addresses done on timer - new option to refresh periodically the ip addresses corresponding to destination addresses --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/fa0e1684a39a505abf95e0fa202907c… Patch: https://github.com/kamailio/kamailio/commit/fa0e1684a39a505abf95e0fa202907c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 66356878ac..b82bc89b90 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3835,6 +3835,85 @@ void ds_ht_timer(unsigned int ticks, void *param) return; } + + +/** + * + */ +void ds_dns_update_set(ds_set_t *node) +{ + int i, j; + char hn[DS_HN_SIZE]; + struct hostent *he; + unsigned short sport = 0; + char sproto = PROTO_NONE; + + if(!node) + return; + + for(i = 0; i < 2; ++i) + ds_dns_update_set(node->next[i]); + + for(j = 0; j < node->nr; j++) { + /* do a DNS qookup for the host part, if not disabled via dst flags */ + if(node->dlist[j].flags & DS_NODNSARES_DST) { + continue; + } + if(node->dlist[j].host.len <= 0) { + continue; + } + LM_DBG("resolving [%.*s] - mode: %d\n", node->dlist[j].host.len, + node->dlist[j].host.s, ds_dns_mode); + if (ds_dns_mode & DS_DNS_MODE_QSRV) { + sport = node->dlist[j].port; + sproto = (char)node->dlist[j].proto; + he = sip_resolvehost(&node->dlist[j].host, &sport, &sproto); + if(he != 0) { + if(sport != 0) { + node->dlist[j].port = sport; + } + if(sproto != PROTO_NONE) { + node->dlist[j].proto = sproto; + } + } + } else { + /* The Hostname needs to be \0 terminated for resolvehost, so we + * make a copy here. */ + memcpy(hn, node->dlist[j].host.s, node->dlist[j].host.len); + hn[node->dlist[j].host.len] = '\0'; + he = resolvehost(hn); + } + if(he == 0) { + LM_ERR("could not resolve %.*s\n", node->dlist[j].host.len, + node->dlist[j].host.s); + continue; + } else { + /* Store hostent in the dispatcher structure */ + hostent2ip_addr(&node->dlist[j].ip_address, he, 0); + } + } +} + +/*! \brief + * Timer for DNS query of destination addresses + * + * This timer is regularly fired. + */ +void ds_dns_timer(unsigned int ticks, void *param) +{ + if(!(ds_dns_mode & DS_DNS_MODE_TIMER)) { + return; + } + + /* Check for the list. */ + if(_ds_list == NULL || _ds_list_nr <= 0) { + LM_DBG("no destination sets\n"); + return; + } + + ds_dns_update_set(_ds_list); +} + int ds_next_dst_api(sip_msg_t *msg, int mode) { return ds_update_dst(msg, DS_USE_NEXT, mode); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index d00bc42e47..fec204bfff 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -173,12 +173,16 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode); */ void ds_check_timer(unsigned int ticks, void *param); - /*! \brief * Timer for checking active calls load */ void ds_ht_timer(unsigned int ticks, void *param); +/*! \brief + * Timer for DNS query of destination addresses + */ +void ds_dns_timer(unsigned int ticks, void *param); + /*! \brief * Check if the reply-code is valid: */ diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8ae2fb7b68..471070fe4e 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -122,6 +122,7 @@ int ds_attrs_none = 0; int ds_load_mode = 0; uint32_t ds_dns_mode = DS_DNS_MODE_INIT; static int ds_dns_mode_param = 0; +static int ds_dns_interval = 0; str ds_outbound_proxy = STR_NULL; @@ -299,6 +300,7 @@ static param_export_t params[]={ {"ds_load_mode", PARAM_INT, &ds_load_mode}, {"reload_delta", PARAM_INT, &ds_reload_delta }, {"ds_dns_mode", PARAM_INT, &ds_dns_mode_param}, + {"ds_dns_interval", PARAM_INT, &ds_dns_interval}, {0,0,0} }; @@ -330,6 +332,15 @@ static int mod_init(void) ds_dns_mode = 1U<<(unsigned int)ds_dns_mode_param; + if(ds_dns_mode & DS_DNS_MODE_TIMER) { + if(ds_dns_interval<=0) { + LM_WARN("dns interval parameter not set - using 600\n"); + ds_dns_interval = 600; + } + if(sr_wtimer_add(ds_dns_timer, NULL, ds_dns_interval) < 0) { + return -1; + } + } if(ds_ping_active_init() < 0) { return -1; }

2 years

[kamailio/kamailio] p_usrloc: make UTC param runtime configurable (PR #3072)

by Stefan Mititelu

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3072 -- Commit Summary -- * p_usrloc: make UTC param runtime configurable -- File Changes -- M src/modules/p_usrloc/config.c (5) M src/modules/p_usrloc/config.h (1) M src/modules/p_usrloc/p_usrloc_mod.c (7) M src/modules/p_usrloc/p_usrloc_mod.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3072.patch https://github.com/kamailio/kamailio/pull/3072.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3072 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3072(a)github.com>

2 years

git:master:ef7f784e: p_usrloc: make UTC param runtime configurable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ef7f784e70087abd8dec22a899eb7c544e9d981d URL: https://github.com/kamailio/kamailio/commit/ef7f784e70087abd8dec22a899eb7c5… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T19:20:35+02:00 p_usrloc: make UTC param runtime configurable --- Modified: src/modules/p_usrloc/config.c Modified: src/modules/p_usrloc/config.h Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/ef7f784e70087abd8dec22a899eb7c5… Patch: https://github.com/kamailio/kamailio/commit/ef7f784e70087abd8dec22a899eb7c5… --- diff --git a/src/modules/p_usrloc/config.c b/src/modules/p_usrloc/config.c index bf24a97229..c95be9ec70 100644 --- a/src/modules/p_usrloc/config.c +++ b/src/modules/p_usrloc/config.c @@ -35,7 +35,8 @@ struct cfg_group_p_usrloc default_p_usrloc_cfg = { DEFAULT_FAILOVER_LEVEL, /* failover_level */ 0, /* db_ops_ruid */ 1, /* db_update_as_insert */ - CONTACT_ONLY /* matching_mode */ + CONTACT_ONLY, /* matching_mode */ + 0, /* utc_timestamps */ }; void *p_usrloc_cfg = &default_p_usrloc_cfg; @@ -53,5 +54,7 @@ cfg_def_t p_usrloc_cfg_def[] = { "Set this parameter if you want to do INSERT DB operations instead of UPDATE DB operations. "}, {"matching_mode", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "Specified which contact maching algorithm to be used (0 - Contact only / 1 - Contact and Call-ID / 2 - Contact and Path)"}, + {"utc_timestamps", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, + "Expires and last_modified timestamps in UTC time format"}, {0, 0, 0, 0, 0, 0} }; diff --git a/src/modules/p_usrloc/config.h b/src/modules/p_usrloc/config.h index 42e16cb6b4..396bcded49 100644 --- a/src/modules/p_usrloc/config.h +++ b/src/modules/p_usrloc/config.h @@ -33,6 +33,7 @@ struct cfg_group_p_usrloc { unsigned int db_ops_ruid; unsigned int db_update_as_insert; unsigned int matching_mode; + unsigned int utc_timestamps; }; extern struct cfg_group_p_usrloc default_p_usrloc_cfg; diff --git a/src/modules/p_usrloc/p_usrloc_mod.c b/src/modules/p_usrloc/p_usrloc_mod.c index b29f4e7e18..89d053d278 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.c +++ b/src/modules/p_usrloc/p_usrloc_mod.c @@ -148,7 +148,6 @@ str uniq_col = str_init(UNIQ_COL); /*!< Name of column containing the un int db_mode = 3; /*!< Database sync scheme: 1-write through, 2-write back, 3-only db */ int use_domain = 0; /*!< Whether usrloc should use domain part of aor */ int desc_time_order = 0; /*!< By default do not enable timestamp ordering */ -int ul_UTC_timestamps = 0; /*!< If set to 1 use UTC instead of local time for expires and last_modified */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 9; @@ -241,7 +240,7 @@ static param_export_t params[] = { {"error_column", PARAM_STR, &error_col }, {"risk_group_column", PARAM_STR, &risk_group_col }, {"expire_time", INT_PARAM, &default_p_usrloc_cfg.expire_time}, - {"UTC_timestamps", INT_PARAM, &ul_UTC_timestamps}, + {"UTC_timestamps", INT_PARAM, &default_p_usrloc_cfg.utc_timestamps}, {"db_err_threshold", INT_PARAM, &default_p_usrloc_cfg.db_err_threshold}, {"failover_level", INT_PARAM, &default_p_usrloc_cfg.failover_level}, {"db_retry_interval", INT_PARAM, &retry_interval }, @@ -484,7 +483,7 @@ struct mi_root* mi_loc_nr_refresh(struct mi_root* cmd_tree, void* param) { #endif time_t ul_db_datetime_set(time_t v) { - if (ul_UTC_timestamps == 1) { + if (cfg_get(p_usrloc, p_usrloc_cfg, utc_timestamps) == 1) { return local2utc(v); } else { return v; @@ -492,7 +491,7 @@ time_t ul_db_datetime_set(time_t v) { } time_t ul_db_datetime_get(time_t v) { - if (ul_UTC_timestamps == 1) { + if (cfg_get(p_usrloc, p_usrloc_cfg, utc_timestamps) == 1) { return utc2local(v); } else { return v; diff --git a/src/modules/p_usrloc/p_usrloc_mod.h b/src/modules/p_usrloc/p_usrloc_mod.h index eb87b7a608..bfdcc2f45c 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.h +++ b/src/modules/p_usrloc/p_usrloc_mod.h @@ -92,7 +92,6 @@ extern int desc_time_order; extern int cseq_delay; extern int ul_fetch_rows; extern int ul_hash_size; -extern int ul_UTC_timestamps; extern str default_db_url;

2 years

BLF: Yealink telephone status freezes

by Liviu Andron

Hello, I have a problem with BLF (Busy Lamp Fields, i.e. dialog events) on Yealink T41S: the key status (green or blinking red) freezes when calling a user to which we SUBSCRIBEd. It freezes until the subscription expires. Using sngrep, I was able to see that some NOTIFYs get a timeout (they are sent 3 times) because the phone doesn't reply (200 OK). These NOTIFY seem to have in common the fact that the caller is the SUBSCRIBEd Yealink user. Example on NOTIFY body: <?xml version="1.0"?> <dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="4" state="full" entity="sip:callee@sip.com"> <dialog id="5_2630032430(a)11.202.138.255" call-id=" 5_2630032430(a)11.202.138.255" direction="recipient"> <state>confirmed</state> <remote> <identity>sip:caller@sip.com:5060</identity> <target uri="sip:caller@11.202.138.255:5060"/> </remote> <local> <identity>sip:callee@sip.com:5060</identity> <target uri="sip:callee@sip.com:5060"/> </local> </dialog> </dialog-info> caller(a)sip.com subscribed to callee(a)sip.com and then called it. I wasn't able to find a solution with the current implementation, for example presence_dialoginfo/force_single_dialog = 1 doesn't help. I come with a setting modparam("presence", "dont_notify_subscribed_caller", 1) that, if enabled, doesn't NOTIFY a subscriber if this one is the caller itself. It does this by validating remote and local elements in the xml body of the NOTIFY message against the message target. Is there a better solution? The technical questions: 1. I verify the sender in the function notify(..) by analyzing the dialog's event xml body. Is there a more direct method, not passing by this xml? modparam("pua_dialoginfo", "include_localremote", 0) - might be missing, but it's not relevant 2. I would have preferred a flag-like solution: but how to flag (refuse) a NOTIFY message that doesn't even pass by the configuration script? For example, I could activate that flag for a SUBSCRIBE coming from "User-Agent: Yealink SIP-T41S". 3. I am using xml_utils.h, so libser_cds, libser_presence, but is this alright? I had to modify their Makefiles for the build to succeed, this gets new dependencies in presence.so ... 4. I verify only that dialog-info/remote & local/identity is not the one of the recipient (the subscriber) and, if so, I stop the notification ... Because the message could contain multiple dialogs, this technique is not enough: removing parts of the dialog is necessary. Thank you, Liviu

2 years

← Newer
1
...
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2022