sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:5.3:c2503540: tm: Fix faked_reply_prio by passing correct reply to get_prio

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: c25035409c1f03c2f6fd24dd5f96eb28db5f3099 URL: https://github.com/kamailio/kamailio/commit/c25035409c1f03c2f6fd24dd5f96eb2… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:46:26+01:00 tm: Fix faked_reply_prio by passing correct reply to get_prio Instead of passing the to be evaluated reply as the "best" reply, pass the actual "best" reply. (cherry picked from commit 5731cc0911ff65bf7efd433a83a25ffbf6073d10) (cherry picked from commit cbd9c3d2851ece3c8f08b0664b72fca18f6f4f77) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/c25035409c1f03c2f6fd24dd5f96eb2… Patch: https://github.com/kamailio/kamailio/commit/c25035409c1f03c2f6fd24dd5f96eb2… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index c868e70a94..99361a5f33 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1171,17 +1171,19 @@ inline static short int get_prio(unsigned int resp, struct sip_msg *rpl) int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) { int best_b, best_s, b; - sip_msg_t *rpl; + sip_msg_t *rpl, *best_rpl; best_b=-1; best_s=0; + best_rpl=NULL; for ( b=0; b<t->nr_of_outgoings ; b++ ) { rpl = t->uac[b].reply; /* "fake" for the currently processed branch */ if (b==inc_branch) { - if (get_prio(inc_code, rpl)<get_prio(best_s, rpl)) { + if (get_prio(inc_code, rpl)<get_prio(best_s, best_rpl)) { best_b=b; best_s=inc_code; + best_rpl=rpl; } continue; } @@ -1197,9 +1199,10 @@ int t_pick_branch(int inc_branch, int inc_code, struct cell *t, int *res_code) return -2; /* if reply is null => t_send_branch "faked" reply, skip over it */ if ( rpl && - get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, rpl) ) { + get_prio(t->uac[b].last_received, rpl)<get_prio(best_s, best_rpl) ) { best_b =b; best_s = t->uac[b].last_received; + best_rpl=rpl; } } /* find lowest branch */

4 years, 2 months

git:5.3:52789f4a: utils/pdbt: Relax permissions when creating files

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 52789f4a0c2cbebd9c09d35e54267f8fc26c4848 URL: https://github.com/kamailio/kamailio/commit/52789f4a0c2cbebd9c09d35e54267f8… Author: Kristian F. HÃ¸gh <kfh(a)uni-tel.dk> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:45:31+01:00 utils/pdbt: Relax permissions when creating files (cherry picked from commit bb42ee28fc115e1e3373962c02162c9a8e6d41fc) (cherry picked from commit 071fe9366b3cc14f0cce1aa0373d20a0242182cb) --- Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/52789f4a0c2cbebd9c09d35e54267f8… Patch: https://github.com/kamailio/kamailio/commit/52789f4a0c2cbebd9c09d35e54267f8… --- diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index 6521985b2b..5a52cf8c7a 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -297,7 +297,7 @@ int dt_write_tree(const struct dt_node_t *root, const char* filename) char number[25]; number[0] = '\0'; - fd = creat(filename, S_IRWXU); + fd = creat(filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); if (fd < 0) { LERR("cannot create file '%s'\n", filename); return -1; @@ -370,7 +370,7 @@ int save_mmap(struct dt_node_t *root, char *filename) { int fd; int n; - fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IRWXU); + fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); if (fd < 0) { LERR("cannot create file '%s'\n", filename); return -1;

4 years, 2 months

git:5.3:5add3307: registrar: added note about branch flags in save()/lookup() doc

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 5add3307469136d792c0bcad29356d947c3ae128 URL: https://github.com/kamailio/kamailio/commit/5add3307469136d792c0bcad29356d9… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:44:58+01:00 registrar: added note about branch flags in save()/lookup() doc (cherry picked from commit f2996bf733a0b5e00fe124440353b9a69a3532a2) (cherry picked from commit f050ce2dc5f27a08bf5c5364e4002b646802eb81) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5add3307469136d792c0bcad29356d9… Patch: https://github.com/kamailio/kamailio/commit/5add3307469136d792c0bcad29356d9… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 8b83e3c00e..3002766bbf 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1051,7 +1051,8 @@ request_route { modify location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, <quote>200 OK</quote> will be returned listing all contacts that are currently in - the location database. On an error, an error message will be sent with a short + the location database. As a side effect, also branch flags are + stored in usrloc. On an error, an error message will be sent with a short description in reason phrase. </para> <para>Meaning of the parameters is as follows:</para> @@ -1152,6 +1153,7 @@ save("location", "0x00", "sip:test@kamailio.org"); Request-URI will be overwritten with the contact that has the highest q value and optionally the rest will be appended to the message (depending on append_branches parameter value). + As a side effect, also branch flags are restored from usrloc. </para> <para> If the <varname>method_filtering</varname> option is enabled and

4 years, 2 months

git:5.3:599ecd66: permissions: exported allow_trusted() to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 599ecd66399daca786c065ff49d76537ffd619ac URL: https://github.com/kamailio/kamailio/commit/599ecd66399daca786c065ff49d7653… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:44:48+01:00 permissions: exported allow_trusted() to kemi - related to #2509 (cherry picked from commit 843b22b4efb0d343f13230d6e90d2484f370dbdb) (cherry picked from commit 12ebd41d0dae516f39933eeabcda1919cb10b71e) --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/599ecd66399daca786c065ff49d7653… Patch: https://github.com/kamailio/kamailio/commit/599ecd66399daca786c065ff49d7653… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index f31cadfa23..e5e67c7af5 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1047,6 +1047,11 @@ static sr_kemi_t sr_kemi_permissions_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("permissions"), str_init("allow_trusted"), + SR_KEMIP_INT, ki_allow_trusted, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index 0381646948..eee710915a 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -506,7 +506,7 @@ int allow_trusted(struct sip_msg* msg, char *src_ip, int proto, char *from_uri) * Checks based on request's source address, protocol, and From URI * if request can be trusted without authentication. */ -int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) +int ki_allow_trusted(sip_msg_t* _msg) { str furi; char furi_string[MAX_URI_SIZE+1]; @@ -529,6 +529,15 @@ int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) furi_string); } +/* + * Checks based on request's source address, protocol, and From URI + * if request can be trusted without authentication. + */ +int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) +{ + return ki_allow_trusted(_msg); +} + /* * Checks based on source address and protocol given in pvar arguments and * provided uri, if request can be trusted without authentication. diff --git a/src/modules/permissions/trusted.h b/src/modules/permissions/trusted.h index d8dfae047c..9a1e4866ed 100644 --- a/src/modules/permissions/trusted.h +++ b/src/modules/permissions/trusted.h @@ -55,6 +55,10 @@ int reload_trusted_table(void); */ void clean_trusted(void); +/* + * Check if request comes from trusted ip address with matching from URI + */ +int ki_allow_trusted(sip_msg_t* _msg); /* * Check if request comes from trusted ip address with matching from URI

4 years, 2 months

git:5.3:c9e547b7: pipelimit: use unsigned to compute size and for iterator

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: c9e547b7a967ad3215814cef62c8cba199e04960 URL: https://github.com/kamailio/kamailio/commit/c9e547b7a967ad3215814cef62c8cba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:44:38+01:00 pipelimit: use unsigned to compute size and for iterator (cherry picked from commit 23818fb34d09a487654ea89c9f29b880c0c75197) (cherry picked from commit 550840b4b9ce8df9acdf875f907ce86533fea43e) --- Modified: src/modules/pipelimit/pl_statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/c9e547b7a967ad3215814cef62c8cba… Patch: https://github.com/kamailio/kamailio/commit/c9e547b7a967ad3215814cef62c8cba… --- diff --git a/src/modules/pipelimit/pl_statistics.c b/src/modules/pipelimit/pl_statistics.c index e1afa2ffb8..0c6c52d389 100644 --- a/src/modules/pipelimit/pl_statistics.c +++ b/src/modules/pipelimit/pl_statistics.c @@ -137,10 +137,12 @@ int get_socket_list_from_proto_and_family(int **ipList, int protocol, int family struct socket_info *si; struct socket_info** list; - int num_ip_octets = family == AF_INET ? NUM_IP_OCTETS : NUM_IPV6_OCTETS; - int numberOfSockets = 0; + unsigned int num_ip_octets = 0; + unsigned int numberOfSockets = 0; int currentRow = 0; + num_ip_octets = (family == AF_INET) ? NUM_IP_OCTETS : NUM_IPV6_OCTETS; + /* I hate to use #ifdefs, but this is necessary because of the way * get_sock_info_list() is defined. */ #ifndef USE_TCP @@ -198,7 +200,7 @@ int get_socket_list_from_proto_and_family(int **ipList, int protocol, int family /* Extract out the IP Addresses and ports. */ for(si=list?*list:0; si; si=si->next){ - int i; + unsigned int i; /* We currently only support IPV4. */ if (si->address.af != family) {

4 years, 2 months

git:master:c6b642c8: blst: comment updated to reflect blocklist api

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c6b642c81d0d4861e445dbb53dc12c94fe9f4040 URL: https://github.com/kamailio/kamailio/commit/c6b642c81d0d4861e445dbb53dc12c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:19:53+01:00 blst: comment updated to reflect blocklist api --- Modified: src/modules/blst/blst.c --- Diff: https://github.com/kamailio/kamailio/commit/c6b642c81d0d4861e445dbb53dc12c9… Patch: https://github.com/kamailio/kamailio/commit/c6b642c81d0d4861e445dbb53dc12c9… --- diff --git a/src/modules/blst/blst.c b/src/modules/blst/blst.c index c6811c02c2..5d33368bd8 100644 --- a/src/modules/blst/blst.c +++ b/src/modules/blst/blst.c @@ -16,7 +16,7 @@ /*! \file * \brief - * blst module :: Blacklist related script functions + * blst module :: Blocklist related script functions * */

4 years, 2 months

git:master:b0194c1c: osp: renamed sample example to reflect project name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b0194c1cb5ae98476f2e5ef2f1ca38e4b1614712 URL: https://github.com/kamailio/kamailio/commit/b0194c1cb5ae98476f2e5ef2f1ca38e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:19:07+01:00 osp: renamed sample example to reflect project name --- Added: src/modules/osp/etc/sample-osp-kamailio.cfg Removed: src/modules/osp/etc/sample-osp-openser.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b0194c1cb5ae98476f2e5ef2f1ca38e… Patch: https://github.com/kamailio/kamailio/commit/b0194c1cb5ae98476f2e5ef2f1ca38e… --- diff --git a/src/modules/osp/etc/sample-osp-openser.cfg b/src/modules/osp/etc/sample-osp-kamailio.cfg similarity index 99% rename from src/modules/osp/etc/sample-osp-openser.cfg rename to src/modules/osp/etc/sample-osp-kamailio.cfg index b0199b238d..9f14e93570 100644 --- a/src/modules/osp/etc/sample-osp-openser.cfg +++ b/src/modules/osp/etc/sample-osp-kamailio.cfg @@ -12,7 +12,7 @@ sip_warning=no check_via=no # (cmd. line: -v) dns=no # (cmd. line: -r) rev_dns=no # (cmd. line: -R) -disable_dns_blacklist=yes +disable_dns_blocklist=yes disable_tcp=yes disable_tls=yes port=5060

4 years, 2 months

use_dst_blacklist syntax error

by Juha Heinanen

Latest master does not like this line in config: use_dst_blacklist=on Start with option -c gives: 0(19289) CRITICAL: <core> [core/cfg.y:3611]: yyerror_at(): parse error in config file /etc/pres-serv/pres-serv.cfg, line 137, column 18: syntax error 0(19289) CRITICAL: <core> [core/cfg.y:3611]: yyerror_at(): parse error in config file /etc/pres-serv/pres-serv.cfg, line 137, column 18: unknown config variable 0(19289) CRITICAL: <core> [core/cfg.y:3608]: yyerror_at(): parse error in config file /etc/pres-serv/pres-serv.cfg, line 137, column 19-20: ERROR: bad config file (3 errors) According to core cookbook, the var exists. With 5.4 the same config file is accepted. -- Juha

4 years, 2 months

git:master:3075872d: modules: readme files regenerated - cfg_db ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3075872de9cb97dd7a1e4f799ab2bebeda22f7a7 URL: https://github.com/kamailio/kamailio/commit/3075872de9cb97dd7a1e4f799ab2beb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-30T14:16:15+01:00 modules: readme files regenerated - cfg_db ... [skip ci] --- Modified: src/modules/cfg_db/README Modified: src/modules/corex/README Modified: src/modules/kex/README Modified: src/modules/regex/README Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/3075872de9cb97dd7a1e4f799ab2beb… Patch: https://github.com/kamailio/kamailio/commit/3075872de9cb97dd7a1e4f799ab2beb… --- diff --git a/src/modules/cfg_db/README b/src/modules/cfg_db/README index 6223f35073..121475d08d 100644 --- a/src/modules/cfg_db/README +++ b/src/modules/cfg_db/README @@ -114,9 +114,9 @@ modparam("cfg_db", "db_url", "mysql://SER:123@127.0.0.1:12345/SER"); cfg_transl table: group_name|name|cfg_table|cfg_table_group_name_field|cfg_table_name_fiel d|cfg_table_value_field - core|use_dst_blacklist|cfg_dns||| - core|dst_blacklist_mem|cfg_dns||| - core|dst_blacklist_expire||| + core|use_dst_blocklist|cfg_dns||| + core|dst_blocklist_mem|cfg_dns||| + core|dst_blocklist_expire||| my|route_addr|cfg_my|my_group_name|my_name|my_value ; overrides <def ault> values my|use_rtp_proxy|cfg_my|my_group_name|my_name|my_value @@ -140,6 +140,6 @@ t> cfg_dns table: group_name|name|value - dns|use_dst_blacklist|1 - dns|dst_blacklist_mem|1024 - dns|dst_blacklist_expire|60 + dns|use_dst_blocklist|1 + dns|dst_blocklist_mem|1024 + dns|dst_blocklist_expire|60 diff --git a/src/modules/corex/README b/src/modules/corex/README index 70b7a07847..11c170d66b 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -250,7 +250,7 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") * name - the domain name * addr - the IP address * ttl - TTL value - * flags - can be: 1 - the domain is unresolvable (like blacklisted); + * flags - can be: 1 - the domain is unresolvable (like blocklisted); 2 - the record is permanent (never times out, never deleted, never overwritten) diff --git a/src/modules/kex/README b/src/modules/kex/README index afb6dd9704..07817ec6f8 100644 --- a/src/modules/kex/README +++ b/src/modules/kex/README @@ -777,7 +777,7 @@ kamcmd system.listMethods Examples: kamcmd mod.stats core all - kamcmd mod.stats userblacklist shm + kamcmd mod.stats tm shm kamcmd mod.stats kex pkg kamcmd mod.stats all all diff --git a/src/modules/regex/README b/src/modules/regex/README index 41f1dc0dd1..7ca830c684 100644 --- a/src/modules/regex/README +++ b/src/modules/regex/README @@ -359,7 +359,7 @@ kamcmd regex.reload ^PJSUA -### Blacklisted source IP's +### Blocklisted source IP's [1] ^190\.232\.250\.226$ diff --git a/src/modules/tm/README b/src/modules/tm/README index 2680fd3442..342c404ce0 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1020,7 +1020,7 @@ modparam("tm", "blst_503", 1) 3.17. blst_503_def_timeout (integer) - Blacklist interval in seconds for a 503 reply with no "Retry-After" + Blocklist interval in seconds for a 503 reply with no "Retry-After" header. See also blst_503, blst_503_min_timeout and blst_503_max_timeout.

4 years, 2 months

git:master:5c5180cc: cfg_db: docs - updated reference to blocklist

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5c5180cce3bfcff20a73f1174d5c9318c9ea3b3b URL: https://github.com/kamailio/kamailio/commit/5c5180cce3bfcff20a73f1174d5c931… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:01:48+01:00 cfg_db: docs - updated reference to blocklist --- Modified: src/modules/cfg_db/doc/cfg_db.xml --- Diff: https://github.com/kamailio/kamailio/commit/5c5180cce3bfcff20a73f1174d5c931… Patch: https://github.com/kamailio/kamailio/commit/5c5180cce3bfcff20a73f1174d5c931… --- diff --git a/src/modules/cfg_db/doc/cfg_db.xml b/src/modules/cfg_db/doc/cfg_db.xml index b547de39e3..d907878d14 100644 --- a/src/modules/cfg_db/doc/cfg_db.xml +++ b/src/modules/cfg_db/doc/cfg_db.xml @@ -78,9 +78,9 @@ <programlisting> cfg_transl table: group_name|name|cfg_table|cfg_table_group_name_field|cfg_table_name_field|cfg_table_value_field - core|use_dst_blacklist|cfg_dns||| - core|dst_blacklist_mem|cfg_dns||| - core|dst_blacklist_expire||| + core|use_dst_blocklist|cfg_dns||| + core|dst_blocklist_mem|cfg_dns||| + core|dst_blocklist_expire||| my|route_addr|cfg_my|my_group_name|my_name|my_value ; overrides <default> values my|use_rtp_proxy|cfg_my|my_group_name|my_name|my_value *|*|||| ; matches all param ids, points to tables defined in row <default> @@ -102,9 +102,9 @@ cfg_dns table: group_name|name|value - dns|use_dst_blacklist|1 - dns|dst_blacklist_mem|1024 - dns|dst_blacklist_expire|60 + dns|use_dst_blocklist|1 + dns|dst_blocklist_mem|1024 + dns|dst_blocklist_expire|60 </programlisting>

4 years, 2 months

← Newer
1
...
9
10
11
12
13
14
15
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020