- sr-dev - kamailio.org

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

08 Apr '22

Module: kamailio Branch: master Commit: a7e9eb0897a0ea512a4c72c44ced9a14113099ff URL: https://github.com/kamailio/kamailio/commit/a7e9eb0897a0ea512a4c72c44ced9a1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-08T13:31:17+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/a7e9eb0897a0ea512a4c72c44ced9a1… Patch: https://github.com/kamailio/kamailio/commit/a7e9eb0897a0ea512a4c72c44ced9a1… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 66659be123..b74ca1841a 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1684,15 +1684,18 @@ kamcmd dispatcher.ping_active 0 * _group_: destination group id * _address_: address of the destination in the _group_ * _flags_ (optional): as described in the list file format, default 0 + * _priority_ (optional): as described in the list file format, + default 0 * _attrs_ (optional): as described in the list file format, default "" Example: ... -# prototype: kamcmd dispatcher.add _group_ _address_ _flags_ _attrs_ +# prototype: kamcmd dispatcher.add _group_ _address_ _flags_ _priority_ _attrs_ kamcmd dispatcher.add 2 sip:127.0.0.1:5080 kamcmd dispatcher.add 3 sip:127.0.0.1:5075 8 -kamcmd dispatcher.add 3 sip:127.0.0.1:5075 0 duid=abc;socket=udp:127.0.0.1:5060 +kamcmd dispatcher.add 3 sip:127.0.0.1:5075 0 0 duid=abc;socket=udp:127.0.0.1:506 +0 ... 5.7. dispatcher.remove

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: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: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: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: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: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

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

[kamailio/kamailio] p_usrloc: make UTC param runtime configurable (PR #3072)
by Stefan Mititelu 07 Apr '22

07 Apr '22

#### 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 2

git:master:ef7f784e: p_usrloc: make UTC param runtime configurable
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

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;

1 0

BLF: Yealink telephone status freezes
by Liviu Andron 07 Apr '22

07 Apr '22

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

1 0

[kamailio/kamailio] mqueue: add mqueue_mode modparam (PR #3053)
by Stefan Mititelu 07 Apr '22

07 Apr '22

#### 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  Add a mqueue parameter to control the mq_add() mode. 0 - default, no changes in behavior 1 - add unique keys, keep oldest 2 - add unique keys, keep newest You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3053 -- Commit Summary -- * mqueue: add mqueue_mode modparam -- File Changes -- M src/modules/mqueue/doc/mqueue_admin.xml (40) M src/modules/mqueue/mqueue_api.c (44) M src/modules/mqueue/mqueue_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3053.patch https://github.com/kamailio/kamailio/pull/3053.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3053 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3053(a)github.com>

2 12

git:master:19a8c97b: corex: new transformation {sock.attr}
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: 19a8c97b0b4089966af6b1705bf5eaee7554e30b URL: https://github.com/kamailio/kamailio/commit/19a8c97b0b4089966af6b1705bf5eae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T09:39:29+02:00 corex: new transformation {sock.attr} - get attributes of a socket address proto:host:port --- Modified: src/modules/corex/corex_mod.c Modified: src/modules/corex/corex_var.c Modified: src/modules/corex/corex_var.h --- Diff: https://github.com/kamailio/kamailio/commit/19a8c97b0b4089966af6b1705bf5eae… Patch: https://github.com/kamailio/kamailio/commit/19a8c97b0b4089966af6b1705bf5eae…

1 0

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

07 Apr '22

Module: kamailio Branch: master Commit: a3d88ed0128d5d9d94af3bc5b9bbc3e1dbe9aea7 URL: https://github.com/kamailio/kamailio/commit/a3d88ed0128d5d9d94af3bc5b9bbc3e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-07T08:31:25+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/a3d88ed0128d5d9d94af3bc5b9bbc3e… Patch: https://github.com/kamailio/kamailio/commit/a3d88ed0128d5d9d94af3bc5b9bbc3e… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index ff24e03f26..5472fd15ba 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1575,8 +1575,9 @@ kamcmd dispatcher.set_duid_state ip 2 xyz Name: dispatcher.list Parameters: - * _rmode_ - (optional) response mode - can be 'short' to get a - shorter version of groups and destinations + * _rmode_ - (optional) response mode - can be: 'short' to get a + shorter version of groups and destinations; 'full' to get more + attributes per destination Example: kamcmd dispatcher.list

1 0

git:master:4e08fbcd: dispatcher: docs updated for rpc dispatcher.list
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: 4e08fbcd45886dfa7d687cda68540ef548b23cf9 URL: https://github.com/kamailio/kamailio/commit/4e08fbcd45886dfa7d687cda68540ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T08:27:19+02:00 dispatcher: docs updated for rpc dispatcher.list --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4e08fbcd45886dfa7d687cda68540ef… Patch: https://github.com/kamailio/kamailio/commit/4e08fbcd45886dfa7d687cda68540ef… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index bcd0a49a71..6075d110fe 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1932,8 +1932,9 @@ onreply_route { <para>Parameters:</para> <itemizedlist> <listitem> - <para>_rmode_ - (optional) response mode - can be 'short' to get a - shorter version of groups and destinations</para> + <para>_rmode_ - (optional) response mode - can be: 'short' to get a + shorter version of groups and destinations; 'full' to get more + attributes per destination</para> </listitem> </itemizedlist> <para>

1 0

git:master:2eac6a0c: core: zero-ending ipv4 string in ip_addr2sbufz() like done for ipv6
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: 2eac6a0c2f2dd7c8831ef65fa9d92b88a79d23af URL: https://github.com/kamailio/kamailio/commit/2eac6a0c2f2dd7c8831ef65fa9d92b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T20:36:26+02:00 core: zero-ending ipv4 string in ip_addr2sbufz() like done for ipv6 --- Modified: src/core/ip_addr.c --- Diff: https://github.com/kamailio/kamailio/commit/2eac6a0c2f2dd7c8831ef65fa9d92b8… Patch: https://github.com/kamailio/kamailio/commit/2eac6a0c2f2dd7c8831ef65fa9d92b8… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index cb07a3e60d..77ac233eee 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -237,7 +237,7 @@ int ip_addr2sbuf(struct ip_addr* ip, char* buff, int len) } -/* same as ip_addr2sbuf, but with [ ] around IPv6 addresses */ +/* same as ip_addr2sbuf, but with [ ] around IPv6 addresses and ending \0 */ int ip_addr2sbufz(struct ip_addr* ip, char* buff, int len) { char *p; @@ -247,15 +247,15 @@ int ip_addr2sbufz(struct ip_addr* ip, char* buff, int len) switch(ip->af){ case AF_INET6: *p++ = '['; - sz = ip6tosbuf(ip->u.addr, p, len-2); + sz = ip6tosbuf(ip->u.addr, p, len-3); p += sz; *p++ = ']'; - *p=0; + *p = '\0'; return sz + 2; - break; case AF_INET: - return ip4tosbuf(ip->u.addr, buff, len); - break; + sz = ip4tosbuf(ip->u.addr, buff, len-1); + buff[sz] = '\0'; + return sz; default: LM_CRIT("unknown address family %d\n", ip->af); return 0;

1 0

git:master:68901fca: dispatcher: new option for rpc list command to print more attributes
by Daniel-Constantin Mierla 07 Apr '22

07 Apr '22

Module: kamailio Branch: master Commit: 68901fca96a2ebfa812dd2b2c857e020e08e7331 URL: https://github.com/kamailio/kamailio/commit/68901fca96a2ebfa812dd2b2c857e02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T08:23:59+02:00 dispatcher: new option for rpc list command to print more attributes --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/68901fca96a2ebfa812dd2b2c857e02… Patch: https://github.com/kamailio/kamailio/commit/68901fca96a2ebfa812dd2b2c857e02… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index ccb8b1334a..8ae2fb7b68 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1587,6 +1587,7 @@ static const char *dispatcher_rpc_list_doc[2] = { #define DS_RPC_PRINT_NORMAL 1 #define DS_RPC_PRINT_SHORT 2 +#define DS_RPC_PRINT_FULL 3 /** * @@ -1604,6 +1605,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, int j; char c[3]; str data = STR_NULL; + char ipbuf[IP_ADDR_MAX_STRZ_SIZE]; if(!node) return 0; @@ -1644,11 +1646,26 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, else c[1] = 'X'; + if(rpc->struct_add(vh, "Ssd", "URI", &node->dlist[j].uri, "FLAGS", + c, "PRIORITY", node->dlist[j].priority) + < 0) { + rpc->fault(ctx, 500, "Internal error creating dest struct"); + return -1; + } + + if(mode == DS_RPC_PRINT_FULL) { + ipbuf[0] = '\0'; + ip_addr2sbufz(&node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); + if(rpc->struct_add(vh, "Ssdd", "HOST", &node->dlist[j].host, + "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, + "PROTOID", (int)node->dlist[j].proto) < 0) { + rpc->fault(ctx, 500, "Internal error creating dest struct"); + return -1; + } + } + if(mode != DS_RPC_PRINT_SHORT && node->dlist[j].attrs.body.s!=NULL) { - if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, - "FLAGS", c, - "PRIORITY", node->dlist[j].priority, - "ATTRS", &wh) < 0) { + if(rpc->struct_add(vh, "{", "ATTRS", &wh) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } @@ -1669,13 +1686,6 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1; } - } else { - if(rpc->struct_add(vh, "Ssd", "URI", &node->dlist[j].uri, "FLAGS", - c, "PRIORITY", node->dlist[j].priority) - < 0) { - rpc->fault(ctx, 500, "Internal error creating dest struct"); - return -1; - } } if (ds_ping_latency_stats) { if(rpc->struct_add(vh, "{", "LATENCY", &lh) < 0) { @@ -1722,6 +1732,8 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) if(n == 1) { if(smode.len==5 && strncasecmp(smode.s, "short", 5)==0) { vmode = DS_RPC_PRINT_SHORT; + } else if(smode.len==4 && strncasecmp(smode.s, "full", 4)==0) { + vmode = DS_RPC_PRINT_FULL; } }

1 0

git:master:bed923dd: core: helper function to get socket by listen string
by Daniel-Constantin Mierla 06 Apr '22

06 Apr '22

Module: kamailio Branch: master Commit: bed923ddb92d9d7b694167f0276414373d3297c4 URL: https://github.com/kamailio/kamailio/commit/bed923ddb92d9d7b694167f02764143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T17:00:02+02:00 core: helper function to get socket by listen string --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/bed923ddb92d9d7b694167f02764143… Patch: https://github.com/kamailio/kamailio/commit/bed923ddb92d9d7b694167f02764143… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a60c4c5678..2b29d2b95c 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -844,6 +844,40 @@ socket_info_t* ksr_get_socket_by_name(str *sockname) return NULL; } +socket_info_t* ksr_get_socket_by_listen(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->sock_str.s == NULL) { + continue; + } + LM_DBG("checking if listen %.*s matches %.*s\n", + sockstr->len, sockstr->s, + si->sock_str.len, si->sock_str.s); + if (sockstr->len == si->sock_str.len + && strncasecmp(sockstr->s, si->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 77baeb42fb..0b517de2de 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -104,6 +104,7 @@ struct socket_info* grep_sock_info_by_port(unsigned short port, 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); struct socket_info** get_sock_info_list(unsigned short proto);

1 0

git:master:1dfeba4a: corex: support matching on listen string for $lsock(...) variable
by Daniel-Constantin Mierla 06 Apr '22

06 Apr '22

Module: kamailio Branch: master Commit: 1dfeba4aeed8cd76c630108b2363155eab07801c URL: https://github.com/kamailio/kamailio/commit/1dfeba4aeed8cd76c630108b2363155… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T17:20:02+02:00 corex: support matching on listen string for $lsock(...) variable --- Modified: src/modules/corex/corex_var.c --- Diff: https://github.com/kamailio/kamailio/commit/1dfeba4aeed8cd76c630108b2363155… Patch: https://github.com/kamailio/kamailio/commit/1dfeba4aeed8cd76c630108b2363155… --- diff --git a/src/modules/corex/corex_var.c b/src/modules/corex/corex_var.c index 9fd1061184..b7575ec043 100644 --- a/src/modules/corex/corex_var.c +++ b/src/modules/corex/corex_var.c @@ -210,6 +210,9 @@ int pv_get_lsock(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 'n': si = ksr_get_socket_by_name(&lexpr.val); break; + case 'l': + si = ksr_get_socket_by_listen(&lexpr.val); + break; } if(si == NULL) { return pv_get_null(msg, param, res);

1 0

git:master:507b8ab6: corex: new variable $lsock(expr) - get listen socket attributes
by Daniel-Constantin Mierla 06 Apr '22

06 Apr '22

Module: kamailio Branch: master Commit: 507b8ab6e109e8b8ec231b2436324c534497c794 URL: https://github.com/kamailio/kamailio/commit/507b8ab6e109e8b8ec231b2436324c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T14:02:10+02:00 corex: new variable $lsock(expr) - get listen socket attributes - the expr is an expression to match the socket and specify the field to return - example: "n/s1/listen" - match the socket with the n[ame] "s1" and return the listen address - wip --- Modified: src/modules/corex/corex_mod.c Modified: src/modules/corex/corex_var.c Modified: src/modules/corex/corex_var.h --- Diff: https://github.com/kamailio/kamailio/commit/507b8ab6e109e8b8ec231b2436324c5… Patch: https://github.com/kamailio/kamailio/commit/507b8ab6e109e8b8ec231b2436324c5…

1 0

git:master:61b32b46: core: count and store global index for listen sockets at startup
by Daniel-Constantin Mierla 06 Apr '22

06 Apr '22

Module: kamailio Branch: master Commit: 61b32b46afd7cc0a82f33aa3d92a5e76c4d87fee URL: https://github.com/kamailio/kamailio/commit/61b32b46afd7cc0a82f33aa3d92a5e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T13:54:59+02:00 core: count and store global index for listen sockets at startup --- Modified: src/core/ip_addr.h Modified: src/core/socket_info.c Modified: src/core/socket_info.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/61b32b46afd7cc0a82f33aa3d92a5e7… Patch: https://github.com/kamailio/kamailio/commit/61b32b46afd7cc0a82f33aa3d92a5e7… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 9205def123..c3f423123e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -110,6 +110,7 @@ typedef struct advertise_info { typedef struct socket_info { int socket; + int gindex; /* global index in the lists of all sockets */ str name; /* name - eg.: foo.bar or 10.0.0.1 */ struct ip_addr address; /* ip address */ str address_str; /*ip address converted to string -- optimization*/ diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 500945a22a..a60c4c5678 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -762,6 +762,54 @@ struct socket_info* grep_sock_info(str* host, unsigned short port, return si; } +/** + * + */ +static int _ksr_sockets_no = 0; + +/** + * + */ +int ksr_sockets_no_get(void) +{ + return _ksr_sockets_no; +} + +/** + * + */ +void ksr_sockets_index(void) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + if(_ksr_sockets_no > 0) { + return; + } + + 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->sockname.s == NULL) { + continue; + } + si->gindex = _ksr_sockets_no; + _ksr_sockets_no++; + } + } while((c_proto = next_proto(c_proto))!=0); + + LM_DBG("number of listen sockets: %d\n", _ksr_sockets_no); +} + socket_info_t* ksr_get_socket_by_name(str *sockname) { socket_info_t *si = NULL; diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 50e4a063c1..77baeb42fb 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -163,4 +163,7 @@ int parse_protohostport(str* ins, sr_phostp_t *r); unsigned int ipv6_get_netif_scope(char *ipval); +int ksr_sockets_no_get(void); +void ksr_sockets_index(void); + #endif diff --git a/src/main.c b/src/main.c index 016a90cabe..2a268a689b 100644 --- a/src/main.c +++ b/src/main.c @@ -2851,6 +2851,7 @@ int main(int argc, char** argv) fprintf(stderr, "failed to initialize list addresses\n"); goto error; } + ksr_sockets_index(); if (default_core_cfg.dns_try_ipv6 && !(socket_types & SOCKET_T_IPV6)){ /* if we are not listening on any ipv6 address => no point * to try to resovle ipv6 addresses */

1 0

least cost routing module activation error
by bayu p 06 Apr '22

06 Apr '22

Dear Kamailio Expert, I already add module lcr, but found error when searching pvar "ddn" inside source code core/pvapi.c at line 923, as shown error log captured below : Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: <core> [core/pvapi.c:923]: pv_parse_spec2(): error searching pvar "ddn" Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: <core> [core/pvapi.c:1126]: pv_parse_spec2(): wrong char [n/110] in [$ddn] at [3 (0)] Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: xlog [xlog.c:511]: xdbg_fixup_helper(): wrong format[Domain of destination: $ddn] Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:901 Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:903 Apr 6 10:26:50 kamal /usr/sbin/kamailio[180954]: ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:918 The question are, how to define correct "INVITE" methode (or correct format) inside route[LCR] which is already defined inside kamailio.cfg: route[LCR] { if (status=="200") { xlog("LCR: Inside the LCR routen"); } if(method=="INVITE") { xlog("We got an invite"); if(!load_gws(1, $rU, $var(caller_uri))) { xlog("Couldn't load gateways"); sl_send_reply("500", "Server Internal Error - Cannot load gateways"); exit; } else { xlog("GW Selected '$avp(i:709)'n"); xlog("Domain of destination: $ddn"); xlog("To URI: $tun"); } if(!next_gw()) { xlog("Couldn't proceed to next gateway"); sl_send_reply("503", "Service not available, no gateways found"); exit; } else { xlog("Calling the first matched gatewayn"); xlog("ruri_user_avp: '$avp(i:500)'n"); xlog("To URI after next_gw: $tun"); xlog("Request URI: $rUn"); } } } Kind Regards

1 0

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

05 Apr '22

Module: kamailio Branch: master Commit: b3bdfa61aabfaf4f546f899b2afe2d288a9849c5 URL: https://github.com/kamailio/kamailio/commit/b3bdfa61aabfaf4f546f899b2afe2d2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-05T21:16:16+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/b3bdfa61aabfaf4f546f899b2afe2d2… Patch: https://github.com/kamailio/kamailio/commit/b3bdfa61aabfaf4f546f899b2afe2d2… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 6f9146b8d6..ff24e03f26 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1569,11 +1569,14 @@ kamcmd dispatcher.set_duid_state ip 2 xyz 5.3. dispatcher.list - Lists the groups and included destinations. + Lists the routing groups with destination addresses and corresponding + attributes. Name: dispatcher.list - Parameters: none + Parameters: + * _rmode_ - (optional) response mode - can be 'short' to get a + shorter version of groups and destinations Example: kamcmd dispatcher.list

1 0

git:master:2e5b8167: dispatcher: option to get shorter result for rpc list command
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: 2e5b81676c91f9c39ba8613f1116a7f8e0e06453 URL: https://github.com/kamailio/kamailio/commit/2e5b81676c91f9c39ba8613f1116a7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T18:11:50+02:00 dispatcher: option to get shorter result for rpc list command --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/2e5b81676c91f9c39ba8613f1116a7f… Patch: https://github.com/kamailio/kamailio/commit/2e5b81676c91f9c39ba8613f1116a7f… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8ff3307548..ccb8b1334a 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1584,10 +1584,15 @@ static void dispatcher_rpc_reload(rpc_t *rpc, void *ctx) static const char *dispatcher_rpc_list_doc[2] = { "Return the content of dispatcher sets", 0}; + +#define DS_RPC_PRINT_NORMAL 1 +#define DS_RPC_PRINT_SHORT 2 + /** * */ -int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) +int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, + int mode) { int i = 0, rc = 0; void *rh; @@ -1604,7 +1609,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) return 0; for(; i < 2; ++i) { - rc = ds_rpc_print_set(node->next[i], rpc, ctx, rpc_handle); + rc = ds_rpc_print_set(node->next[i], rpc, ctx, rpc_handle, mode); if(rc != 0) return rc; } @@ -1639,7 +1644,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) else c[1] = 'X'; - if(node->dlist[j].attrs.body.s) { + if(mode != DS_RPC_PRINT_SHORT && node->dlist[j].attrs.body.s!=NULL) { if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, "FLAGS", c, "PRIORITY", node->dlist[j].priority, @@ -1709,6 +1714,16 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) { void *th; void *ih; + int n; + str smode; + int vmode = DS_RPC_PRINT_NORMAL; + + n = rpc->scan(ctx, "*S", &smode); + if(n == 1) { + if(smode.len==5 && strncasecmp(smode.s, "short", 5)==0) { + vmode = DS_RPC_PRINT_SHORT; + } + } ds_set_t *dslist = ds_get_list(); int dslistnr = ds_get_list_nr(); @@ -1729,7 +1744,7 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) return; } - ds_rpc_print_set(dslist, rpc, ctx, ih); + ds_rpc_print_set(dslist, rpc, ctx, ih, vmode); return; }

1 0

git:master:3f84e45e: dispatcher: docs updated for rpc dispatcher.list
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: 3f84e45edc0d00866b76b7f35d569f02ff72eff2 URL: https://github.com/kamailio/kamailio/commit/3f84e45edc0d00866b76b7f35d569f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T21:07:31+02:00 dispatcher: docs updated for rpc dispatcher.list --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f84e45edc0d00866b76b7f35d569f0… Patch: https://github.com/kamailio/kamailio/commit/3f84e45edc0d00866b76b7f35d569f0… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 78523a7c1b..bcd0a49a71 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1923,12 +1923,19 @@ onreply_route { <function moreinfo="none">dispatcher.list</function> </title> <para> - Lists the groups and included destinations. + Lists the routing groups with destination addresses and corresponding + attributes. </para> <para> Name: <emphasis>dispatcher.list</emphasis> </para> - <para>Parameters: <emphasis>none</emphasis></para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>_rmode_ - (optional) response mode - can be 'short' to get a + shorter version of groups and destinations</para> + </listitem> + </itemizedlist> <para> Example: </para>

1 0

git:master:e680b6b7: dispatcher: option to do srv dns query for target addresses
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: e680b6b7f7fc33c98720b928b505e8ac96980186 URL: https://github.com/kamailio/kamailio/commit/e680b6b7f7fc33c98720b928b505e8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T13:02:06+02:00 dispatcher: option to do srv dns query for target addresses --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/e680b6b7f7fc33c98720b928b505e8a… Patch: https://github.com/kamailio/kamailio/commit/e680b6b7f7fc33c98720b928b505e8a…

1 0

git:master:03f844bb: dispatcher: fix compile error by previous commit pushing unsaved files
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: 03f844bbe842107ad09cbf46bfcbff722e788937 URL: https://github.com/kamailio/kamailio/commit/03f844bbe842107ad09cbf46bfcbff7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T11:07:56+02:00 dispatcher: fix compile error by previous commit pushing unsaved files --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/03f844bbe842107ad09cbf46bfcbff7… Patch: https://github.com/kamailio/kamailio/commit/03f844bbe842107ad09cbf46bfcbff7… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b770a02a40..c62f484b8f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3352,7 +3352,7 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, /* dst record using hotname with dns not done - no ip to match */ continue; } - if(ds_dns_mode != DS_DNS_MODE_ALWAYS) { + if(!(ds_dns_mode & DS_DNS_MODE_ALWAYS)) { ipa = &node->dlist[j].ip_address; } else { memcpy(hn, node->dlist[j].host.s, node->dlist[j].host.len); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 6a1b88c484..8ff3307548 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -120,7 +120,7 @@ int ds_hash_check_interval = 30; int ds_timer_mode = 0; int ds_attrs_none = 0; int ds_load_mode = 0; -uint32_t ds_dns_mode = DS_DNS_INIT; +uint32_t ds_dns_mode = DS_DNS_MODE_INIT; static int ds_dns_mode_param = 0; str ds_outbound_proxy = STR_NULL;

1 0

git:master:bf6b1fef: dispatcher: turned ds_dns_mode values in bit flags
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: bf6b1feffeef81f43c9bffc75f7a1fbf5cd9caa7 URL: https://github.com/kamailio/kamailio/commit/bf6b1feffeef81f43c9bffc75f7a1fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T10:29:57+02:00 dispatcher: turned ds_dns_mode values in bit flags --- 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/bf6b1feffeef81f43c9bffc75f7a1fb… Patch: https://github.com/kamailio/kamailio/commit/bf6b1feffeef81f43c9bffc75f7a1fb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d59eebe23e..b770a02a40 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -111,7 +111,7 @@ extern float ds_latency_estimator_alpha; extern int ds_attrs_none; extern param_t *ds_db_extra_attrs_list; extern int ds_load_mode; -extern int ds_dns_mode; +extern uint32_t ds_dns_mode; static db_func_t ds_dbf; static db1_con_t *ds_db_handle = NULL; @@ -486,7 +486,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) /* Do a DNS-Lookup for the Host-Name, if not disabled via dst flags */ if(dp->flags & DS_NODNSARES_DST) { dp->irmode |= DS_IRMODE_NOIPADDR; - } else if (ds_dns_mode==DS_DNS_MODE_INIT || ds_dns_mode==DS_DNS_MODE_TIMER) { + } else if (ds_dns_mode & (DS_DNS_MODE_INIT|DS_DNS_MODE_TIMER)) { he = resolvehost(hn); if(he == 0) { LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 36e01e96ef..0d79386906 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -74,9 +74,9 @@ #define DS_IRMODE_NOIPADDR 1 -#define DS_DNS_MODE_INIT 0 -#define DS_DNS_MODE_ALWAYS 1 -#define DS_DNS_MODE_TIMER 2 +#define DS_DNS_MODE_INIT 1 +#define DS_DNS_MODE_ALWAYS (1<<1) +#define DS_DNS_MODE_TIMER (1<<2) /* clang-format on */ typedef struct ds_rctx { diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 6317334fba..6a1b88c484 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -120,7 +120,8 @@ int ds_hash_check_interval = 30; int ds_timer_mode = 0; int ds_attrs_none = 0; int ds_load_mode = 0; -int ds_dns_mode = 0; +uint32_t ds_dns_mode = DS_DNS_INIT; +static int ds_dns_mode_param = 0; str ds_outbound_proxy = STR_NULL; @@ -297,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}, + {"ds_dns_mode", PARAM_INT, &ds_dns_mode_param}, {0,0,0} }; @@ -327,11 +328,7 @@ static int mod_init(void) param_hooks_t phooks; param_t *pit = NULL; - if(ds_dns_mode!=DS_DNS_MODE_INIT && ds_dns_mode!=DS_DNS_MODE_ALWAYS - && ds_dns_mode!=DS_DNS_MODE_TIMER) { - LM_ERR("invalid dns mode %d\n", ds_dns_mode); - return -1; - } + ds_dns_mode = 1U<<(unsigned int)ds_dns_mode_param; if(ds_ping_active_init() < 0) { return -1;

1 0

git:master:cdf8cb64: dispatcher: check valid values for ds_dns_mode
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: cdf8cb6444f3b3f9aeb76053edc05bf595d4a583 URL: https://github.com/kamailio/kamailio/commit/cdf8cb6444f3b3f9aeb76053edc05bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T07:54:15+02:00 dispatcher: check valid values for ds_dns_mode --- 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/cdf8cb6444f3b3f9aeb76053edc05bf… Patch: https://github.com/kamailio/kamailio/commit/cdf8cb6444f3b3f9aeb76053edc05bf… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0ca8839c89..d59eebe23e 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -82,10 +82,6 @@ #define DS_HN_SIZE 256 -#define DS_DNS_MODE_INIT 0 -#define DS_DNS_MODE_ALWAYS 1 -#define DS_DNS_MODE_CACHE 2 - /* increment call load */ #define DS_LOAD_INC(dgrp, didx) do { \ lock_get(&(dgrp)->lock); \ @@ -490,7 +486,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) /* Do a DNS-Lookup for the Host-Name, if not disabled via dst flags */ if(dp->flags & DS_NODNSARES_DST) { dp->irmode |= DS_IRMODE_NOIPADDR; - } else if (ds_dns_mode==DS_DNS_MODE_INIT || ds_dns_mode==DS_DNS_MODE_CACHE) { + } else if (ds_dns_mode==DS_DNS_MODE_INIT || ds_dns_mode==DS_DNS_MODE_TIMER) { he = resolvehost(hn); if(he == 0) { LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index e360e67592..36e01e96ef 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -73,8 +73,12 @@ #define DS_XAVP_CTX_SKIP_CNT 1 #define DS_IRMODE_NOIPADDR 1 -/* clang-format on */ +#define DS_DNS_MODE_INIT 0 +#define DS_DNS_MODE_ALWAYS 1 +#define DS_DNS_MODE_TIMER 2 + +/* clang-format on */ typedef struct ds_rctx { int flags; int code; diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 42b1a41aa8..6317334fba 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -327,6 +327,12 @@ static int mod_init(void) param_hooks_t phooks; param_t *pit = NULL; + if(ds_dns_mode!=DS_DNS_MODE_INIT && ds_dns_mode!=DS_DNS_MODE_ALWAYS + && ds_dns_mode!=DS_DNS_MODE_TIMER) { + LM_ERR("invalid dns mode %d\n", ds_dns_mode); + return -1; + } + if(ds_ping_active_init() < 0) { return -1; }

1 0

git:master:1b5b0aa9: dispatcher: added ds_dns_mode parameter
by Daniel-Constantin Mierla 04 Apr '22

04 Apr '22

Module: kamailio Branch: master Commit: 1b5b0aa94b82845995791a356b68ed6e1cbc3491 URL: https://github.com/kamailio/kamailio/commit/1b5b0aa94b82845995791a356b68ed6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-04T19:34:55+02:00 dispatcher: added ds_dns_mode parameter - control when dns resolving is done for hostnames in target addresses from dispatcher groups (wip) --- 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/1b5b0aa94b82845995791a356b68ed6… Patch: https://github.com/kamailio/kamailio/commit/1b5b0aa94b82845995791a356b68ed6…

1 0

git:master:5555e893: mqueue: use local variable to lock early only when needed
by Daniel-Constantin Mierla 04 Apr '22

04 Apr '22

Module: kamailio Branch: master Commit: 5555e893ea0997a7c71a3e424ef09c4570f122f6 URL: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-04T08:02:44+02:00 mqueue: use local variable to lock early only when needed --- Modified: src/modules/mqueue/mqueue_api.c --- Diff: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… Patch: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… --- diff --git a/src/modules/mqueue/mqueue_api.c b/src/modules/mqueue/mqueue_api.c index 59421f6e2f..b38f0a1069 100644 --- a/src/modules/mqueue/mqueue_api.c +++ b/src/modules/mqueue/mqueue_api.c @@ -293,6 +293,7 @@ int mq_item_add(str *qname, str *key, str *val) mq_item_t *mi = NULL; mq_item_t *miter = NULL; mq_item_t *miter_prev = NULL; + int oplock = 0; int len; mh = mq_head_get(qname); @@ -301,9 +302,10 @@ int mq_item_add(str *qname, str *key, str *val) LM_ERR("mqueue not found: %.*s\n", qname->len, qname->s); return -1; } - - lock_get(&mh->lock); + if (mh->addmode == 1 || mh->addmode == 2) { + lock_get(&mh->lock); + oplock = 1; miter = mh->ifirst; miter_prev = mh->ifirst; while (miter) { @@ -344,7 +346,9 @@ int mq_item_add(str *qname, str *key, str *val) if(mi==NULL) { LM_ERR("no more shm to add to: %.*s\n", qname->len, qname->s); - lock_release(&mh->lock); + if(oplock) { + lock_release(&mh->lock); + } return -1; } memset(mi, 0, len); @@ -352,12 +356,15 @@ int mq_item_add(str *qname, str *key, str *val) memcpy(mi->key.s, key->s, key->len); mi->key.len = key->len; mi->key.s[key->len] = '\0'; - + mi->val.s = mi->key.s + mi->key.len + 1; memcpy(mi->val.s, val->s, val->len); mi->val.len = val->len; mi->val.s[val->len] = '\0'; + if(oplock==0) { + lock_get(&mh->lock); + } if(mh->ifirst==NULL) { mh->ifirst = mi;

1 0

git:master:c09daf26: modules: readme files regenerated - ims_qos ... [skip ci]
by Kamailio Dev 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: c09daf26a58f23483c2b8cf1f40c990f20e4d215 URL: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-01T14:16:20+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README Modified: src/modules/mqueue/README Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990… Patch: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990…

1 0

git:master:20559f64: ims_qos: removed angle brakets in the text
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 20559f647fee0dc46fef83f8f7782ec24a1f0b94 URL: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T14:04:27+02:00 ims_qos: removed angle brakets in the text --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… Patch: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index 3a72257f7d..0ff629e17e 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -388,7 +388,7 @@ modparam("ims_qos", "include_rtcp_fd", 1) <section> <title><varname>af_signaling_ip</varname> (String)</title> - <para>Set P-CSCF IPv4 address to generate the flows for the UE<->PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> + <para>Set P-CSCF IPv4 address to generate the flows for the UE - PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> <para><emphasis> Default value is 127.0.0.1</emphasis></para> @@ -407,7 +407,7 @@ modparam("ims_qos", "af_signaling_ip", "127.0.0.1") <section> <title><varname>af_signaling_ip6</varname> (String)</title> - <para>Set P-CSCF IPv6 address to generate the flows for the UE<->PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> + <para>Set P-CSCF IPv6 address to generate the flows for the UE - PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> <para><emphasis> Default value is ""</emphasis></para>

1 0

git:master:6da1a08b: stirshaken: docs - add missing end of section tag
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 6da1a08b12e162a5dd4cde90033f51e7b9d48656 URL: https://github.com/kamailio/kamailio/commit/6da1a08b12e162a5dd4cde90033f51e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T14:08:22+02:00 stirshaken: docs - add missing end of section tag --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6da1a08b12e162a5dd4cde90033f51e… Patch: https://github.com/kamailio/kamailio/commit/6da1a08b12e162a5dd4cde90033f51e… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index f54747d0cf..25434ff0b4 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -57,6 +57,7 @@ </itemizedlist> </para> </section> + </section> <section> <title>Parameters</title> <section>

1 0

git:master:2799782c: mqueue: add mqueue_mode modparam
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 2799782c530927de5db3c69df18b8248b8055ee2 URL: https://github.com/kamailio/kamailio/commit/2799782c530927de5db3c69df18b824… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T14:01:41+02:00 mqueue: add mqueue_mode modparam --- Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_api.c Modified: src/modules/mqueue/mqueue_api.h Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2799782c530927de5db3c69df18b824… Patch: https://github.com/kamailio/kamailio/commit/2799782c530927de5db3c69df18b824…

1 0

git:master:e2383b74: modules: readme files regenerated - ims_qos ... [skip ci]
by Kamailio Dev 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: e2383b74f79107aed232ffb8e6a311c56f64ff46 URL: https://github.com/kamailio/kamailio/commit/e2383b74f79107aed232ffb8e6a311c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-01T14:01:12+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/e2383b74f79107aed232ffb8e6a311c… Patch: https://github.com/kamailio/kamailio/commit/e2383b74f79107aed232ffb8e6a311c…

1 0

[kamailio/kamailio] uac: fix shm leak (PR #3065)
by Stefan Mititelu 01 Apr '22

01 Apr '22

#### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Setup: uac_req_send() with evroute=2 and tm module enable_uac_fr=1 Noticed following shm errors while intensively testing uac_req_send(), happening quite soon after a fresh restart (e.g. 10 min): ``` kamailio[5384]: ERROR: <core> [core/mem/q_malloc.c:297]: qm_find_free(): qm_find_free(0x7fe8943bc000, 40632); Free fragment not found! kamailio[5384]: ERROR: <core> [core/mem/q_malloc.c:430]: qm_malloc(): qm_malloc(0x7fe8943bc000, 40632) called from uac: uac_send.c: uac_send_info_clone(105), module: uac; Free fragment not found! kamailio[5384]: ERROR: uac [uac_send.c:108]: uac_send_info_clone(): no more shm memory kamailio[5384]: ERROR: uac [uac_send.c:837]: uac_req_send(): cannot clone the uac structure ``` I tried monitoring system memory using `free` tool and noticed that the "used" memory didn't grow alot. However, I noticed the "buff/cached" memory had a steep growth when 200OK(s) started to come, for my setup. Noticed that, for my setup, when 200OK come, event_route[uac:reply] is not called, so the tm callback set by UAC module is not called. => the "tp" callback parameter shm allocated by UAC module is not freed. By analogy, when using uac_req_send() with evroute=1 and timeout happens (e.g. no reply comes), event_route[uac:reply] won't be called and same leak should happen => *i didn;t tested that*, was just an analogy. I updated the code to call the callback on TMCB_DESTROY, and make sure tp parameter is freed, *one time*. Let me know what you think of this... in my setup/tests I got no kamailio shm logs anymore. Also "buff/cached" memory didn't have that steep growth anymore. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3065 -- Commit Summary -- * uac: fix shm leak -- File Changes -- M src/modules/uac/uac_send.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3065.patch https://github.com/kamailio/kamailio/pull/3065.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3065 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3065(a)github.com>

3 4

git:master:1ff0a9c4: uac: fix shm leak
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 1ff0a9c4cee17a68a54c7002a528710ce85b96da URL: https://github.com/kamailio/kamailio/commit/1ff0a9c4cee17a68a54c7002a528710… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T13:55:44+02:00 uac: fix shm leak --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/1ff0a9c4cee17a68a54c7002a528710… Patch: https://github.com/kamailio/kamailio/commit/1ff0a9c4cee17a68a54c7002a528710… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index 887dc1b4a4..be04464cae 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -717,14 +717,16 @@ void uac_resend_tm_callback(struct cell *t, int type, struct tmcb_params *ps) } tp = (uac_send_info_t*)(*ps->param); - if(tp->evroute!=0) { + if(tp->evroute!=0 && ps->code > 0) { uac_req_run_event_route((ps->rpl==FAKED_REPLY)?NULL:ps->rpl, tp, ps->code); } done: - if(tp!=NULL) + if(tp!=NULL){ shm_free(tp); + *ps->param = NULL; + } return; } @@ -755,7 +757,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) } tp = (uac_send_info_t*)(*ps->param); - if(tp->evroute!=0) { + if(tp->evroute!=0 && ps->code > 0) { uac_req_run_event_route((ps->rpl==FAKED_REPLY)?NULL:ps->rpl, tp, ps->code); } @@ -829,7 +831,7 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) uac_r.body = (tp->s_body.len <= 0) ? NULL : &tp->s_body; uac_r.ssock = (tp->s_sock.len <= 0) ? NULL : &tp->s_sock; uac_r.dialog = &tmdlg; - uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED|TMCB_DESTROY; if(tp->evroute!=0) { /* Callback function */ uac_r.cb = uac_resend_tm_callback; @@ -849,8 +851,10 @@ void uac_send_tm_callback(struct cell *t, int type, struct tmcb_params *ps) done: error: - if(tp!=NULL) + if(tp!=NULL){ shm_free(tp); + *ps->param = NULL; + } return; } @@ -890,13 +894,13 @@ int uac_req_send(void) { case 2: - uac_r.cb_flags = TMCB_ON_FAILURE; + uac_r.cb_flags = TMCB_ON_FAILURE|TMCB_DESTROY; /* Callback function */ uac_r.cb = uac_resend_tm_callback; break; case 1: default: - uac_r.cb_flags = TMCB_LOCAL_COMPLETED; + uac_r.cb_flags = TMCB_LOCAL_COMPLETED|TMCB_DESTROY; /* Callback function */ uac_r.cb = uac_send_tm_callback; break;

1 0

[kamailio/kamailio] ims_qos: Added new parameters for AAR, AVP517 (PR #3066)
by alexyosifov 01 Apr '22

01 Apr '22

- Added new parameters: af_signaling_ip6, component_media_type, flow_protocol, omit_flow_ports, rs_default_bandwidth, rr_default_bandwidth. Check doc for details.   #### 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) - [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/3066 -- Commit Summary -- * ims_qos: Added new parameters for AAR,AVP517 -- File Changes -- M src/modules/ims_qos/doc/ims_qos_admin.xml (134) M src/modules/ims_qos/ims_qos_mod.c (13) M src/modules/ims_qos/rx_aar.c (29) M src/modules/ims_qos/rx_avp.c (67) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3066.patch https://github.com/kamailio/kamailio/pull/3066.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3066 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3066(a)github.com>

2 2

git:master:5a85767e: ims_qos: Added new parameters for AAR, AVP517
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 5a85767ef3371dd6443e9cc0caebf3b68980dc07 URL: https://github.com/kamailio/kamailio/commit/5a85767ef3371dd6443e9cc0caebf3b… Author: Aleksandar Yosifov <alexander.yosifov(a)circles.bz> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T13:54:38+02:00 ims_qos: Added new parameters for AAR,AVP517 - Added new parameters: af_signaling_ip6, component_media_type, flow_protocol, omit_flow_ports, rs_default_bandwidth, rr_default_bandwidth. Check doc for details. --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c Modified: src/modules/ims_qos/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/5a85767ef3371dd6443e9cc0caebf3b… Patch: https://github.com/kamailio/kamailio/commit/5a85767ef3371dd6443e9cc0caebf3b…

1 0

[kamailio/kamailio] stirshaken: fix doc typos (PR #3067)
by mrtrev 01 Apr '22

01 Apr '22

#### 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Seems I managed to submit a corrupted doc file with my last PR. Tested it plenty this time and fixed a typo while I was at it. Also I see this is showing my previous PR as well. I'm not sure how to make it not do that. Any tips would be appreciated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3067 -- Commit Summary -- * stirshaken: Add PVs to allow access to x509 subject and ppt grants * Merge branch 'kamailio:master' into master * stirshaken: fix doc typos -- File Changes -- M src/modules/stirshaken/doc/stirshaken_admin.xml (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3067.patch https://github.com/kamailio/kamailio/pull/3067.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3067 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3067(a)github.com>

2 1

git:master:1986ac41: stirshaken: fix doc typos
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 1986ac41e38d2bd7600a19527cf00164876e77e3 URL: https://github.com/kamailio/kamailio/commit/1986ac41e38d2bd7600a19527cf0016… Author: Trevor Peirce <trev(a)acrovoice.ca> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T13:52:31+02:00 stirshaken: fix doc typos --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1986ac41e38d2bd7600a19527cf0016… Patch: https://github.com/kamailio/kamailio/commit/1986ac41e38d2bd7600a19527cf0016… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index 1e7c7001ef..f54747d0cf 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -275,8 +275,7 @@ modparam("stirshaken", "vs_certsubject_pvname", "$vn(certsubject)") </programlisting> </example> </section> - </section> - <section> + <section> <title><varname>vs_pptgrants_pvname</varname> (str)</title> <para> If vs_pptgrants_pvname is set then the JSON string of the authenticated PASSporT's grants will be written to this pseudo-variable when @@ -422,7 +421,7 @@ request_route { </para> <para> The parameters can contain pseudo-variables. - If origid is empty, an unique identifier will be generated wih libuuid, e.g. "3f31bd2b-9fc4-4084-b0b0-566506c46292". + If origid is empty, an unique identifier will be generated with libuuid, e.g. "3f31bd2b-9fc4-4084-b0b0-566506c46292". </para> <para> This function can be used from ANY_ROUTE.

1 0

git:master:58fde684: modules: readme files regenerated - evrexec ... [skip ci]
by Kamailio Dev 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 58fde6844ca5b6f98ca12693d59e22722635cf16 URL: https://github.com/kamailio/kamailio/commit/58fde6844ca5b6f98ca12693d59e227… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-01T09:01:22+02:00 modules: readme files regenerated - evrexec ... [skip ci] --- Modified: src/modules/evrexec/README --- Diff: https://github.com/kamailio/kamailio/commit/58fde6844ca5b6f98ca12693d59e227… Patch: https://github.com/kamailio/kamailio/commit/58fde6844ca5b6f98ca12693d59e227… --- diff --git a/src/modules/evrexec/README b/src/modules/evrexec/README index 4d80d4c006..059b8d7bea 100644 --- a/src/modules/evrexec/README +++ b/src/modules/evrexec/README @@ -104,7 +104,8 @@ Chapter 1. Admin Guide * wait - timer interval in micro-seconds to wait inside the dedicated process before executing the task. * sockaddr - full UDP socket address in format 'udp:ip:port' - (example: 'udp:127.0.0.1:54321'). + (example: 'udp:127.0.0.1:54321'). Received data is made available + in the event route via $evr(data). Default value is NULL. @@ -124,7 +125,7 @@ event_route[evrexec:timer] { } event_route[evrexec:udp] { - xinfo("udp socket data: [$evr(data)]\n"); + xinfo("udp socket data: [$evr(data)] from [$evr(srcip)]\n"); } ...

1 0

git:master:ba98cbb7: evrexec: docs update with variable example
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: ba98cbb78e0e2b9f4075bf548bb8e9bc3c3c8b48 URL: https://github.com/kamailio/kamailio/commit/ba98cbb78e0e2b9f4075bf548bb8e9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T08:50:16+02:00 evrexec: docs update with variable example --- Modified: src/modules/evrexec/doc/evrexec_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ba98cbb78e0e2b9f4075bf548bb8e9b… Patch: https://github.com/kamailio/kamailio/commit/ba98cbb78e0e2b9f4075bf548bb8e9b… --- diff --git a/src/modules/evrexec/doc/evrexec_admin.xml b/src/modules/evrexec/doc/evrexec_admin.xml index 565b33f560..a2bcfe1403 100644 --- a/src/modules/evrexec/doc/evrexec_admin.xml +++ b/src/modules/evrexec/doc/evrexec_admin.xml @@ -102,7 +102,8 @@ <listitem> <para> <emphasis>sockaddr</emphasis> - full UDP socket address in format - 'udp:ip:port' (example: 'udp:127.0.0.1:54321'). + 'udp:ip:port' (example: 'udp:127.0.0.1:54321'). Received data is + made available in the event route via $evr(data). </para> </listitem> @@ -129,7 +130,7 @@ event_route[evrexec:timer] { } event_route[evrexec:udp] { - xinfo("udp socket data: [$evr(data)]\n"); + xinfo("udp socket data: [$evr(data)] from [$evr(srcip)]\n"); } ...

1 0

git:master:22041301: evrexec: use structure of exec context attributes
by Daniel-Constantin Mierla 31 Mar '22

31 Mar '22

Module: kamailio Branch: master Commit: 220413010fa1e268501edd8808dc02fcc8b9d0d1 URL: https://github.com/kamailio/kamailio/commit/220413010fa1e268501edd8808dc02f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-30T17:28:29+02:00 evrexec: use structure of exec context attributes --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/220413010fa1e268501edd8808dc02f… Patch: https://github.com/kamailio/kamailio/commit/220413010fa1e268501edd8808dc02f… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index 89a189c9c8..e3d131ff9f 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -52,7 +52,14 @@ typedef struct evrexec_task { evrexec_task_t *_evrexec_list = NULL; -static str *pv_evr_data = NULL; +typedef struct evrexec_info { + str data; + str srcip; + str srcport; + int srcportno; +} evrexec_info_t; + +static evrexec_info_t _evrexec_info = { 0 }; /** module functions */ static int mod_init(void); @@ -222,7 +229,6 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) struct sockaddr_storage src_addr; socklen_t src_addr_len; ssize_t count; - str evr_data = STR_NULL; char srchostval[NI_MAXHOST]; char srcportval[NI_MAXSERV]; @@ -282,9 +288,8 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) LM_DBG("received data from %s port %s\n", srchostval, srcportval); } - evr_data.s = rcvbuf; - evr_data.len = (int)count; - pv_evr_data = &evr_data; + _evrexec_info.data.s = rcvbuf; + _evrexec_info.data.len = (int)count; fmsg = faked_msg_next(); set_route_type(LOCAL_ROUTE); @@ -302,7 +307,7 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) LM_ERR("error running event route kemi callback\n"); } } - pv_evr_data = NULL; + memset(&_evrexec_info, 0, sizeof(evrexec_info_t)); } /* avoid exiting the process */ while(1) { sleep(3600); } @@ -412,13 +417,13 @@ int evrexec_param(modparam_t type, void *val) */ static int pv_get_evr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { - if(param==NULL || pv_evr_data==NULL) { + if(param==NULL || _evrexec_info.data.s==NULL) { return pv_get_null(msg, param, res); } switch(param->pvn.u.isname.name.n) { case 0: /* data */ - return pv_get_strval(msg, param, res, pv_evr_data); + return pv_get_strval(msg, param, res, &_evrexec_info.data); default: return pv_get_null(msg, param, res); } @@ -489,12 +494,12 @@ void rpc_evr_run(rpc_t *rpc, void *c) evr_data.len = strlen(evr_data.s); } - pv_evr_data = &evr_data; + _evrexec_info.data = evr_data; keng = sr_kemi_eng_get(); if(keng==NULL) { evr_id = route_lookup(&event_rt, evr_name.s); if(evr_id == -1) { - pv_evr_data = NULL; + memset(&_evrexec_info, 0, sizeof(evrexec_info_t)); LM_ERR("event route not found: %.*s\n", evr_name.len, evr_name.s); rpc->fault(c, 500, "Event route not found"); return; @@ -522,7 +527,7 @@ void rpc_evr_run(rpc_t *rpc, void *c) } } set_route_type(rtbk); - pv_evr_data = NULL; + memset(&_evrexec_info, 0, sizeof(evrexec_info_t)); } /**

1 0

git:master:0292cae2: evrexec: exposed src ip and port via variable
by Daniel-Constantin Mierla 31 Mar '22

31 Mar '22

Module: kamailio Branch: master Commit: 0292cae2812628e433cc07af6a45bf229e2ba708 URL: https://github.com/kamailio/kamailio/commit/0292cae2812628e433cc07af6a45bf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-31T08:23:58+02:00 evrexec: exposed src ip and port via variable --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0292cae2812628e433cc07af6a45bf2… Patch: https://github.com/kamailio/kamailio/commit/0292cae2812628e433cc07af6a45bf2… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index e3d131ff9f..253197d100 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -286,6 +286,11 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) NI_NUMERICHOST | NI_NUMERICSERV); if(ret == 0) { LM_DBG("received data from %s port %s\n", srchostval, srcportval); + _evrexec_info.srcip.s = srchostval; + _evrexec_info.srcip.len = strlen(_evrexec_info.srcip.s); + _evrexec_info.srcport.s = srcportval; + _evrexec_info.srcport.len = strlen(_evrexec_info.srcport.s); + str2sint(&_evrexec_info.srcport, &_evrexec_info.srcportno); } _evrexec_info.data.s = rcvbuf; @@ -424,6 +429,19 @@ static int pv_get_evr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) switch(param->pvn.u.isname.name.n) { case 0: /* data */ return pv_get_strval(msg, param, res, &_evrexec_info.data); + case 1: /* srcpip */ + if(_evrexec_info.srcip.s==NULL) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &_evrexec_info.srcip); + case 2: /* srcport */ + if(_evrexec_info.srcport.s==NULL) { + return pv_get_null(msg, param, res); + } + return pv_get_strval(msg, param, res, &_evrexec_info.srcport); + case 3: /* srcportno */ + return pv_get_sintval(msg, param, res, _evrexec_info.srcportno); + default: return pv_get_null(msg, param, res); } @@ -445,6 +463,27 @@ static int pv_parse_evr_name(pv_spec_p sp, str *in) goto error; } break; + case 5: + if(strncmp(in->s, "srcip", 5)==0) { + sp->pvp.pvn.u.isname.name.n = 1; + } else { + goto error; + } + break; + case 7: + if(strncmp(in->s, "srcport", 7)==0) { + sp->pvp.pvn.u.isname.name.n = 2; + } else { + goto error; + } + break; + case 9: + if(strncmp(in->s, "srcportno", 9)==0) { + sp->pvp.pvn.u.isname.name.n = 3; + } else { + goto error; + } + break; default: goto error; }

1 0

git:master:b81000ca: evrexec: log src ip and port
by Daniel-Constantin Mierla 30 Mar '22

30 Mar '22

Module: kamailio Branch: master Commit: b81000ca0f3332a00831ce9d6e774027beb4a605 URL: https://github.com/kamailio/kamailio/commit/b81000ca0f3332a00831ce9d6e77402… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-30T13:01:03+02:00 evrexec: log src ip and port --- Modified: src/modules/evrexec/evrexec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b81000ca0f3332a00831ce9d6e77402… Patch: https://github.com/kamailio/kamailio/commit/b81000ca0f3332a00831ce9d6e77402… --- diff --git a/src/modules/evrexec/evrexec_mod.c b/src/modules/evrexec/evrexec_mod.c index 71e7c94921..89a189c9c8 100644 --- a/src/modules/evrexec/evrexec_mod.c +++ b/src/modules/evrexec/evrexec_mod.c @@ -223,6 +223,8 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) socklen_t src_addr_len; ssize_t count; str evr_data = STR_NULL; + char srchostval[NI_MAXHOST]; + char srcportval[NI_MAXSERV]; if(parse_protohostport(&it->sockaddr, &phostp)<0 || phostp.port==0 || phostp.host.len>62 || phostp.sport.len>5) { @@ -273,6 +275,13 @@ void evrexec_process_socket(evrexec_task_t *it, int idx) } rcvbuf[count] = '\0'; + ret = getnameinfo((struct sockaddr *)&src_addr, src_addr_len, srchostval, + sizeof(srchostval), srcportval, sizeof(srcportval), + NI_NUMERICHOST | NI_NUMERICSERV); + if(ret == 0) { + LM_DBG("received data from %s port %s\n", srchostval, srcportval); + } + evr_data.s = rcvbuf; evr_data.len = (int)count; pv_evr_data = &evr_data;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev