sr-dev March 2022

sr-dev@lists.kamailio.org

10 participants
242 discussions

git:5.5:b8329204: Erlang: Revert breaking change

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b83292042aae87c445e05c3f82231ca6d335cc96 URL: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:11+01:00 Erlang: Revert breaking change Revert https://github.com/kamailio/kamailio/commit/6542a367638ec5f8a2b62994f8c309e… xavp_add_xavp_value returns the root and not the xavp it added and that was the reason for the code the commit removed. Changed a variable name to help make that more clear. Also related to https://github.com/kamailio/kamailio/issues/2069. (cherry picked from commit 1ed58f0de4f7a3ab3a81dd84c1c3b94fa1df2c4b) --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… Patch: https://github.com/kamailio/kamailio/commit/b83292042aae87c445e05c3f82231ca… --- diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index 894c36784c..b19a22ac8e 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -86,11 +86,15 @@ sr_xavp_t *xbuff_new(str *name) if(!xbuffs_root) { - xbuff = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); - } else { - xbuff = xavp_get_child(&xbuff_list, name); + xbuffs_root = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); + if (!xbuffs_root){ + LM_ERR("cannot create xbuffs_root \n"); + return NULL; + } } + xbuff = xavp_get_child(&xbuff_list, name); + if (!xbuff) { xbuff_val.type = SR_XTYPE_NULL;

2 years, 2 months

git:5.5:34eceee6: Erlang: Erlang module assumes pvi.type is zero

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 34eceee62f20dfd4ef148277c93391e5e778ccef URL: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… Author: James Van Vleet <james(a)vanvleet.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:14:01+01:00 Erlang: Erlang module assumes pvi.type is zero Related to this commit: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… (cherry picked from commit fa74be53232d56797209a630823a20346f9d2597) --- Modified: src/modules/erlang/pv_atom.c Modified: src/modules/erlang/pv_pid.c Modified: src/modules/erlang/pv_ref.c Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… Patch: https://github.com/kamailio/kamailio/commit/34eceee62f20dfd4ef148277c93391e… --- diff --git a/src/modules/erlang/pv_atom.c b/src/modules/erlang/pv_atom.c index b37f01560f..092672751c 100644 --- a/src/modules/erlang/pv_atom.c +++ b/src/modules/erlang/pv_atom.c @@ -51,6 +51,9 @@ int pv_atom_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_pid.c b/src/modules/erlang/pv_pid.c index 2de3f5e698..acb2bee5b2 100644 --- a/src/modules/erlang/pv_pid.c +++ b/src/modules/erlang/pv_pid.c @@ -54,6 +54,9 @@ int pv_pid_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_ref.c b/src/modules/erlang/pv_ref.c index 052f7ced90..927cb4b855 100644 --- a/src/modules/erlang/pv_ref.c +++ b/src/modules/erlang/pv_ref.c @@ -54,6 +54,9 @@ int pv_ref_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break; diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index ce6e2bd2eb..894c36784c 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -198,6 +198,9 @@ int pv_xbuff_parse_name(pv_spec_t *sp, str *in) name.s = p; + /*pvi.type now defaults to 4, breaking the erlang module's type management*/ + sp->pvp.pvi.type = 0; + while (is_in_str(p, in)) { if (*p == '[' || *p== '=') break;

2 years, 2 months

git:5.5:11e7c173: tmx: use trimmed call-id value for hashing

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 11e7c173f2974c2174d1ccaca717eb63c5608a84 URL: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T10:13:19+01:00 tmx: use trimmed call-id value for hashing (cherry picked from commit 88f1a1a671c4486e5000415b3d52eb42e6ad4cbb) --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… Patch: https://github.com/kamailio/kamailio/commit/11e7c173f2974c2174d1ccaca717eb6… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 256c82bf16..7bb2315fd3 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -243,7 +243,7 @@ int tmx_check_pretran(sip_msg_t *msg) sftag = get_from(msg)->tag_value; trim(&sftag); - chid = get_hash1_raw(msg->callid->body.s, msg->callid->body.len); + chid = get_hash1_raw(scallid.s, scallid.len); slotid = chid & (_tmx_ptran_size-1); if(unlikely(_tmx_proc_ptran == NULL)) {

2 years, 2 months

git:5.5:39e6c357: siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 39e6c357a93a62033082a3bed2f985b8ad47db13 URL: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T09:33:52+01:00 siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate - GH #3042 (cherry picked from commit e3b9521a150ac2245dee2afeac5d674768c7399a) --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… Patch: https://github.com/kamailio/kamailio/commit/39e6c357a93a62033082a3bed2f985b… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 63fdd5c6cb..31d7f716ca 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -349,7 +349,7 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) } } - if(msg_send(pdst, buf, len) < 0) { + if(msg_send_buffer(pdst, buf, len, 1) < 0) { LM_ERR("cannot send duplicate message\n"); goto error; }

2 years, 2 months

git:master:e3b9521a: siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e3b9521a150ac2245dee2afeac5d674768c7399a URL: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-02T09:29:06+01:00 siptrace: use msg_send_buffer() to skip send callbacks for uri duplicate - GH #3042 --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… Patch: https://github.com/kamailio/kamailio/commit/e3b9521a150ac2245dee2afeac5d674… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 63fdd5c6cb..31d7f716ca 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -349,7 +349,7 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) } } - if(msg_send(pdst, buf, len) < 0) { + if(msg_send_buffer(pdst, buf, len, 1) < 0) { LM_ERR("cannot send duplicate message\n"); goto error; }

2 years, 2 months

git:master:3dc980d6: modules: readme files regenerated - jwt ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3dc980d66fc4caeea90bb95870394c8855b51dec URL: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-02T08:46:19+01:00 modules: readme files regenerated - jwt ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8… Patch: https://github.com/kamailio/kamailio/commit/3dc980d66fc4caeea90bb95870394c8…

2 years, 2 months

git:master:eee5068e: jwt: add missing tag in doc

by Victor Seva

Module: kamailio Branch: master Commit: eee5068e2f315b6d391e6fe7b6aef4875afcf574 URL: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-02T08:39:26+01:00 jwt: add missing tag in doc error instroduced at aaa142d293105ef27f7e4b6143fc3fb18c9a5a75 --- Modified: src/modules/jwt/doc/jwt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… Patch: https://github.com/kamailio/kamailio/commit/eee5068e2f315b6d391e6fe7b6aef48… --- diff --git a/src/modules/jwt/doc/jwt_admin.xml b/src/modules/jwt/doc/jwt_admin.xml index 45d98c7689..a72c518efe 100644 --- a/src/modules/jwt/doc/jwt_admin.xml +++ b/src/modules/jwt/doc/jwt_admin.xml @@ -115,6 +115,7 @@ modparam("jwt", "key_mode", 1) added as string value. </para> </listitem> + <listitem> <para> headers - the list of headers to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters format).

2 years, 2 months

git:master:9d1f223c: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9d1f223c7705a7ed8d888f50f2611dea1649ffa5 URL: https://github.com/kamailio/kamailio/commit/9d1f223c7705a7ed8d888f50f2611de… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-03-01T14:01:17+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/9d1f223c7705a7ed8d888f50f2611de… Patch: https://github.com/kamailio/kamailio/commit/9d1f223c7705a7ed8d888f50f2611de… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index d1721ffa84..dc28b471ec 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -249,10 +249,13 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") The format of the value follows the SIP params style: "attr1=val1;attr2=val2;...". The attributes can be: - * type - it can be "A" (IPv4) or "AAAA" (IPv6) + * type - it can be "A" (IPv4), "AAAA" (IPv6) or "SRV" * name - the domain name * addr - the IP address * ttl - TTL value + * priority - priority value for SRV record + * weight - weight value for SRV record + * port - port value for SRV record * flags - can be: 1 - the domain is unresolvable (like blocklisted); 2 - the record is permanent (never times out, never deleted, never overwritten)

2 years, 2 months

git:master:c9d682fa: corex: docs extended for dns_cache parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c9d682fa7fb52357c2ca3779b1d23d1d151f065a URL: https://github.com/kamailio/kamailio/commit/c9d682fa7fb52357c2ca3779b1d23d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-01T13:48:29+01:00 corex: docs extended for dns_cache parameter --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c9d682fa7fb52357c2ca3779b1d23d1… Patch: https://github.com/kamailio/kamailio/commit/c9d682fa7fb52357c2ca3779b1d23d1… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 5ae9bea44a..6a1b94e021 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -109,7 +109,7 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") <itemizedlist> <listitem> <para> - <emphasis>type</emphasis> - it can be "A" (IPv4) or "AAAA" (IPv6) + <emphasis>type</emphasis> - it can be "A" (IPv4), "AAAA" (IPv6) or "SRV" </para> </listitem> <listitem> @@ -127,6 +127,21 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") <emphasis>ttl</emphasis> - TTL value </para> </listitem> + <listitem> + <para> + <emphasis>priority</emphasis> - priority value for SRV record + </para> + </listitem> + <listitem> + <para> + <emphasis>weight</emphasis> - weight value for SRV record + </para> + </listitem> + <listitem> + <para> + <emphasis>port</emphasis> - port value for SRV record + </para> + </listitem> <listitem> <para> <emphasis>flags</emphasis> - can be: 1 - the domain is unresolvable

2 years, 2 months

git:master:23c8ba29: corex: support adding dns srv records via dns_cache param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 23c8ba29ac4cd0ccbc3012e87e48f289bfb9d200 URL: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-01T13:45:54+01:00 corex: support adding dns srv records via dns_cache param --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… Patch: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index b4e0b67a87..b2fc9c09b2 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -383,6 +383,10 @@ static int corex_dns_cache_param_add(str *pval) unsigned short dns_type = 0; int dns_ttl = 0; int dns_flags = 0; + int dns_priority = 0; + int dns_weight = 0; + int dns_port = 0; + if(pval==NULL) { LM_ERR("invalid parameter\n"); @@ -414,8 +418,11 @@ static int corex_dns_cache_param_add(str *pval) || (pit->body.s[0]=='A'))) { dns_type = T_A; } else if((pit->body.len == 4) - && strncasecmp(pit->name.s, "aaaa", 4)==0) { + && strncasecmp(pit->body.s, "aaaa", 4)==0) { dns_type = T_AAAA; + } else if((pit->body.len == 3) + && strncasecmp(pit->body.s, "srv", 3)==0) { + dns_type = T_SRV; } } else if(pit->name.len==3 && strncasecmp(pit->name.s, "ttl", 3)==0) { @@ -433,6 +440,30 @@ static int corex_dns_cache_param_add(str *pval) return -1; } } + } else if(pit->name.len==8 + && strncasecmp(pit->name.s, "priority", 8)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_priority) < 0) { + LM_ERR("invalid priority: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } else if(pit->name.len==6 + && strncasecmp(pit->name.s, "weight", 6)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_weight) < 0) { + LM_ERR("invalid weight: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } else if(pit->name.len==4 + && strncasecmp(pit->name.s, "port", 4)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_port) < 0) { + LM_ERR("invalid port: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } } } @@ -440,9 +471,9 @@ static int corex_dns_cache_param_add(str *pval) &dns_name, dns_ttl, &dns_addr, - 0 /* priority */, - 0 /* weight */, - 0 /* port */, + dns_priority, /* priority */ + dns_weight, /* weight */ + dns_port, /* port */ dns_flags) == 0) { return 0; }

2 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2022