sr-dev April 2022

sr-dev@lists.kamailio.org

17 participants
286 discussions

git:master:8e211bc1: dispatcher: docs updated for rpc add command
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: 8e211bc196abd49a635192f788364afad13c5a45 URL: https://github.com/kamailio/kamailio/commit/8e211bc196abd49a635192f788364af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T13:28:23+02:00 dispatcher: docs updated for rpc add command --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8e211bc196abd49a635192f788364af… Patch: https://github.com/kamailio/kamailio/commit/8e211bc196abd49a635192f788364af… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 23dcb513e6..1e67256c88 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2082,8 +2082,9 @@ DEST: { <function moreinfo="none">dispatcher.add</function> </title> <para> - Add a destination address to the in-memory dispatcher list. Reloading the dispatcher will remove - any destinations that are only added to the in-memory dispatcher list. + Add a destination address to the in-memory dispatcher list. Reloading + the dispatcher will remove any destinations that are only added to the + in-memory dispatcher list. </para> <para> Name: <emphasis>dispatcher.add</emphasis> @@ -2097,6 +2098,9 @@ DEST: { <listitem><para>_flags_ (optional): as described in the list file format, default 0</para></listitem> + <listitem><para>_priority_ (optional): as described in the list file format, + default 0</para></listitem> + <listitem><para>_attrs_ (optional): as described in the list file format, default ""</para></listitem> @@ -2106,10 +2110,10 @@ DEST: { </para> <programlisting format="linespecific"> ... -# prototype: &sercmd; dispatcher.add _group_ _address_ _flags_ _attrs_ +# prototype: &sercmd; dispatcher.add _group_ _address_ _flags_ _priority_ _attrs_ &sercmd; dispatcher.add 2 sip:127.0.0.1:5080 &sercmd; dispatcher.add 3 sip:127.0.0.1:5075 8 -&sercmd; dispatcher.add 3 sip:127.0.0.1:5075 0 duid=abc;socket=udp:127.0.0.1:5060 +&sercmd; dispatcher.add 3 sip:127.0.0.1:5075 0 0 duid=abc;socket=udp:127.0.0.1:5060 ... </programlisting> </section>

1 0

git:master:a7ade4f3: dispatcher: rpc command to add a record updated to get priority
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: a7ade4f3c6c2439ebc286c0c595c92b88550dbc3 URL: https://github.com/kamailio/kamailio/commit/a7ade4f3c6c2439ebc286c0c595c92b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T13:25:31+02:00 dispatcher: rpc command to add a record updated to get priority --- 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/a7ade4f3c6c2439ebc286c0c595c92b… Patch: https://github.com/kamailio/kamailio/commit/a7ade4f3c6c2439ebc286c0c595c92b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b82bc89b90..0f6a6b178f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2611,12 +2611,11 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) } /* add dispatcher entry to in-memory dispatcher list */ -int ds_add_dst(int group, str *address, int flags, str *attrs) +int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) { - int setn, priority; + int setn; setn = _ds_list_nr; - priority = 0; *ds_next_idx = (*ds_crt_idx + 1) % 2; ds_avl_destroy(&ds_lists[*ds_next_idx]); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index fec204bfff..3eaa9894dd 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -145,7 +145,7 @@ int ds_select_dst_limit(sip_msg_t *msg, int set, int alg, uint32_t limit, int mode); int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode); int ds_update_dst(struct sip_msg *msg, int upos, int mode); -int ds_add_dst(int group, str *address, int flags, str *attrs); +int ds_add_dst(int group, str *address, int flags, int priority, str *attrs); int ds_remove_dst(int group, str *address); int ds_update_state(sip_msg_t *msg, int group, str *address, int state, ds_rctx_t *rctx); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index e877e3bf6c..ccf579fba8 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1907,7 +1907,7 @@ static const char *dispatcher_rpc_add_doc[2] = { */ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) { - int group, flags, nparams; + int group, flags, priority, nparams; str dest; str attrs = STR_NULL; @@ -1924,17 +1924,18 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) *ds_rpc_reload_time = time(NULL); flags = 0; + priority = 0; - nparams = rpc->scan(ctx, "dS*dS", &group, &dest, &flags, &attrs); + nparams = rpc->scan(ctx, "dS*ddS", &group, &dest, &flags, &priority, &attrs); if(nparams < 2) { rpc->fault(ctx, 500, "Invalid Parameters"); return; - } else if (nparams <= 3) { + } else if (nparams <= 4) { attrs.s = 0; attrs.len = 0; } - if(ds_add_dst(group, &dest, flags, &attrs) != 0) { + if(ds_add_dst(group, &dest, flags, priority, &attrs) != 0) { rpc->fault(ctx, 500, "Adding dispatcher dst failed"); return; }

1 0

git:master:d09e2250: corex: $lsock() variable can match by advertise address
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

Module: kamailio Branch: master Commit: d09e2250db652650945867d135faa84a08dda820 URL: https://github.com/kamailio/kamailio/commit/d09e2250db652650945867d135faa84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T12:39:12+02:00 corex: $lsock() variable can match by advertise address --- Modified: src/modules/corex/corex_var.c --- Diff: https://github.com/kamailio/kamailio/commit/d09e2250db652650945867d135faa84… Patch: https://github.com/kamailio/kamailio/commit/d09e2250db652650945867d135faa84… --- diff --git a/src/modules/corex/corex_var.c b/src/modules/corex/corex_var.c index 0f0f5c39e1..74fcff6e79 100644 --- a/src/modules/corex/corex_var.c +++ b/src/modules/corex/corex_var.c @@ -215,6 +215,9 @@ int pv_get_lsock(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 'l': si = ksr_get_socket_by_listen(&lexpr.val); break; + case 'a': + si = ksr_get_socket_by_advertise(&lexpr.val); + break; } if(si == NULL) { return pv_get_null(msg, param, res);

1 0

git:master:313c0a93: core: helper function to get socket by advertise address
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

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);

1 0

git:master:e272eea0: permissions: return ret variable set inside double_fixup()
by Daniel-Constantin Mierla 08 Apr '22

08 Apr '22

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 */

1 0

git:master:d4d20240: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 07 Apr '22

07 Apr '22

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…

1 0

git:master:168b7653: p_usrloc: add a note to docs about runtime change of UTC parameter, related to gh #3072
by Henning Westerholt 07 Apr '22

07 Apr '22

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>

1 0

git:master:a3ca4237: dispatcher: docs for ds_dns_mode and ds_dns_interval
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

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>

1 0

git:master:fd0794bc: dispatcher: set default value for ds_dns_interval to 600
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

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");

1 0

git:master:fa0e1684: dispatcher: dns resolving of destination addresses done on timer
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

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; }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2022