sr-dev

sr-dev@lists.kamailio.org

15 participants
45333 discussions

git:5.3:e5262a61: nathelper: docs for nat_addr_mode parameter
by Henning Westerholt 24 Apr '20

24 Apr '20

Module: kamailio Branch: 5.3 Commit: e5262a61b7fcd87ef39d3cd08c78cffc7fa48011 URL: https://github.com/kamailio/kamailio/commit/e5262a61b7fcd87ef39d3cd08c78cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-24T12:29:11Z nathelper: docs for nat_addr_mode parameter (cherry picked from commit 9721922e2e47f3e8403bc540ecd73b55f41d5d91) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e5262a61b7fcd87ef39d3cd08c78cff… Patch: https://github.com/kamailio/kamailio/commit/e5262a61b7fcd87ef39d3cd08c78cff… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 2ab9f00ff8..9aac37722e 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -466,6 +466,52 @@ modparam("nathelper", "filter_server_id", 1) </example> </section> + <section id="nathelper.p.nat_addr_mode"> + <title><varname>nat_addr_mode</varname> (int)</title> + <para> + If set to 0, only default private net addresses are checked by + nat_uac_test(). If set to 1, other reserved net addresses are + checked by nat_uac_test() as well. + </para> + <para>Default private net addresses are:</para> + <itemizedlist> + <listitem> + <para>10.0.0.0/8</para> + <listitem> + <listitem> + <para>172.16.0.0/12</para> + <listitem> + <listitem> + <para>192.168.0.0/16</para> + <listitem> + <listitem> + <para>100.64.0.0/10 - RFC6598 - Carrier Grade NAT</para> + <listitem> + <listitem> + <para>192.0.0.0/29 - RFC7335 - IPv4 Service Continuity Prefix</para> + <listitem> + <itemizedlist> + <para>Reserved net addresses are:</para> + <itemizedlist> + <listitem> + <para>192.0.0.0/24 - RFC7335 - IETF Protocol Assignments</para> + <listitem> + <itemizedlist> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>nat_addr_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "nat_addr_mode", 0) +... +</programlisting> + </example> + </section> + </section>

1 0

git:5.3:657ac663: nathelper: new parameter nat_addr_mode
by Henning Westerholt 24 Apr '20

24 Apr '20

Module: kamailio Branch: 5.3 Commit: 657ac663b973ef769dea21f9983ff0e2cf8e2444 URL: https://github.com/kamailio/kamailio/commit/657ac663b973ef769dea21f9983ff0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-04-24T12:29:00Z nathelper: new parameter nat_addr_mode - if set to 0, default private net addresses are checked by nat_uac_test() - if set to 1, other reserved net addresses are checked by nat_uac_test() - default 1 (reserved addresses are considered not routable) - related at GH #2277 (cherry picked from commit a10e7652f24bc7ed8e74ff27d16da5d77689b6ac) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/657ac663b973ef769dea21f9983ff0e… Patch: https://github.com/kamailio/kamailio/commit/657ac663b973ef769dea21f9983ff0e… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index e77c9470a8..7d326508c8 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -138,13 +138,16 @@ static int cblen = 0; static int natping_interval = 0; struct socket_info *force_socket = 0; +static int nh_nat_addr_mode = 1; /* clang-format off */ -static struct { +typedef struct nh_netaddr { const char *cnetaddr; uint32_t netaddr; uint32_t mask; -} nets_1918[] = { +} nh_netaddr_t; + +static nh_netaddr_t nh_nets_1918[] = { {"10.0.0.0", 0, 0xffffffffu << 24}, {"172.16.0.0", 0, 0xffffffffu << 20}, {"192.168.0.0", 0, 0xffffffffu << 16}, @@ -152,6 +155,11 @@ static struct { {"192.0.0.0", 0, 0xffffffffu << 3}, /* rfc7335 - IPv4 Service Continuity Prefix */ {NULL, 0, 0} }; + +static nh_netaddr_t nh_nets_extra[] = { + {"192.0.0.0", 0, 0xffffffffu << 8}, /* rfc7335 - IETF Protocol Assignments */ + {NULL, 0, 0} +}; /* clang-format on */ /* @@ -250,6 +258,7 @@ static param_export_t params[] = { {"udpping_from_path", INT_PARAM, &udpping_from_path }, {"append_sdp_oldmediaip", INT_PARAM, &sdp_oldmediaip }, {"filter_server_id", INT_PARAM, &nh_filter_srvid }, + {"nat_addr_mode", INT_PARAM, &nh_nat_addr_mode }, {0, 0, 0} }; @@ -528,10 +537,17 @@ static int mod_init(void) } /* Prepare 1918 networks list */ - for(i = 0; nets_1918[i].cnetaddr != NULL; i++) { - if(inet_aton(nets_1918[i].cnetaddr, &addr) != 1) + for(i = 0; nh_nets_1918[i].cnetaddr != NULL; i++) { + if(inet_aton(nh_nets_1918[i].cnetaddr, &addr) != 1) abort(); - nets_1918[i].netaddr = ntohl(addr.s_addr) & nets_1918[i].mask; + nh_nets_1918[i].netaddr = ntohl(addr.s_addr) & nh_nets_1918[i].mask; + } + + /* Prepare reserved/extra networks list */ + for(i = 0; nh_nets_extra[i].cnetaddr != NULL; i++) { + if(inet_aton(nh_nets_extra[i].cnetaddr, &addr) != 1) + abort(); + nh_nets_extra[i].netaddr = ntohl(addr.s_addr) & nh_nets_extra[i].mask; } register_select_table(sel_declaration); @@ -1260,11 +1276,18 @@ static inline int is1918addr_n(uint32_t netaddr) uint32_t hl; hl = ntohl(netaddr); - for(i = 0; nets_1918[i].cnetaddr != NULL; i++) { - if((hl & nets_1918[i].mask) == nets_1918[i].netaddr) { + for(i = 0; nh_nets_1918[i].cnetaddr != NULL; i++) { + if((hl & nh_nets_1918[i].mask) == nh_nets_1918[i].netaddr) { return 1; } } + if(nh_nat_addr_mode==1) { + for(i = 0; nh_nets_extra[i].cnetaddr != NULL; i++) { + if((hl & nh_nets_extra[i].mask) == nh_nets_extra[i].netaddr) { + return 1; + } + } + } return 0; }

1 0

[kamailio/kamailio] db_redis: warning: 'table_name.len' may be used uninitialized (#2169)
by sergey-safarov 23 Apr '20

23 Apr '20

``` CC (gcc) [M db_redis.so] redis_table.o CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o In file included from ../../lib/srdb1/../../core/ut.h:42, from ../../lib/srdb1/db_key.h:31, from ../../lib/srdb1/db.h:43, from db_redis_mod.h:26, from redis_table.c:25: redis_table.c: In function 'db_redis_parse_keys': ../../lib/srdb1/../../core/dprint.h:303:8: warning: 'table_name.len' may be used uninitialized in this function [-Wmaybe-uninitialized] 303 | fprintf(stderr, "%2d(%d) %s: %.*s%s" fmt, \ | ^~~~~~~ redis_table.c:494:9: note: 'table_name.len' was declared here 494 | str table_name; | ^~~~~~~~~~ In file included from ../../lib/srdb1/../../core/ut.h:42, from ../../lib/srdb1/db_key.h:31, from ../../lib/srdb1/db.h:43, from db_redis_mod.h:26, from redis_table.c:25: ../../lib/srdb1/../../core/dprint.h:303:8: warning: 'table_name.s' may be used uninitialized in this function [-Wmaybe-uninitialized] 303 | fprintf(stderr, "%2d(%d) %s: %.*s%s" fmt, \ | ^~~~~~~ redis_table.c:494:9: note: 'table_name.s' was declared here 494 | str table_name; | ^~~~~~~~~~ redis_table.c:581:38: warning: 'table' may be used uninitialized in this function [-Wmaybe-uninitialized] 581 | table->types = type_target = type; | ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ CC (gcc) [M db_redis.so] redis_dbase.o make[3]: 'libsrdb2.so.1.0' is up to date. make[3]: 'libsrdb1.so.1.0' is up to date. ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2169

4 12

[kamailio/kamailio] dispatcher module not adding additional destinations to destination set when maxload=0 (#2297)
by kdanderso 23 Apr '20

23 Apr '20

#2057 # Description The documentation for the dispatcher module indicates that maxload = 0 indicates no call limit for the call load distribution algorithm. However, when filling in the XAVP list for additional destinations, mode 10 does not handle the case where maxload = 0, so there are never any additional destinations in this case. This means that there is no failover if the original destination fails. Issue #800 also addressed a maxload = 0 issue, but did not address the XAVP list. ### Possible Solutions The following patch resolves the issue for me: ```diff diff -ru a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c --- a/modules/dispatcher/dispatch.c 2020-04-23 10:41:32.414130450 -0500 +++ b/modules/dispatcher/dispatch.c 2020-04-23 10:42:11.738154578 -0500 @@ -2273,6 +2273,7 @@ } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; } @@ -2294,6 +2295,7 @@ } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; } ``` ### Additional Information I am using the following version. The issue appears to still exist in the master branch. version: kamailio 5.3.2 (arm6/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 17:22:09 Mar 18 2020 with gcc 8.3.0 Thank you. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2297

2 2

git:5.3:0df6a220: dispatcher: handle the case of maxload 0 for call load distribution
by Daniel-Constantin Mierla 23 Apr '20

23 Apr '20

Module: kamailio Branch: 5.3 Commit: 0df6a22015d48a57a91ac4b34411fad0a7272179 URL: https://github.com/kamailio/kamailio/commit/0df6a22015d48a57a91ac4b34411fad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-23T19:06:18+02:00 dispatcher: handle the case of maxload 0 for call load distribution - GH #2297 (cherry picked from commit 0115d3424c0f8780a661882527f39b2b39d0e74e) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/0df6a22015d48a57a91ac4b34411fad… Patch: https://github.com/kamailio/kamailio/commit/0df6a22015d48a57a91ac4b34411fad… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index ecbfa71433..aaa7b4a2d5 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2247,6 +2247,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; } @@ -2268,6 +2269,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; }

1 0

git:master:0115d342: dispatcher: handle the case of maxload 0 for call load distribution
by Daniel-Constantin Mierla 23 Apr '20

23 Apr '20

Module: kamailio Branch: master Commit: 0115d3424c0f8780a661882527f39b2b39d0e74e URL: https://github.com/kamailio/kamailio/commit/0115d3424c0f8780a661882527f39b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-23T19:04:58+02:00 dispatcher: handle the case of maxload 0 for call load distribution - GH #2297 --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/0115d3424c0f8780a661882527f39b2… Patch: https://github.com/kamailio/kamailio/commit/0115d3424c0f8780a661882527f39b2… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 6ded012085..004bb0cfae 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2273,6 +2273,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; } @@ -2294,6 +2295,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } /* max load exceeded per destination */ if(rstate->alg == DS_ALG_CALLLOAD + && idx->dlist[i].attrs.maxload != 0 && idx->dlist[i].dload >= idx->dlist[i].attrs.maxload) { continue; }

1 0

[info] matrix chat room for kamailio
by Daniel-Constantin Mierla 23 Apr '20

23 Apr '20

Thanks to the efforts made by Fred Posner, a matrix.org server has been installed on Kamailio project infrastructure (matrix.kamailio.dev - server sponsored by lod.com), which enables us to create chat rooms as we need for our community of users and developers. It tries to be an alternative to the existing IRC #kamailio channel, given that a while ago freenode.net had to enforce user registration to join the channels on their service (not complaining about it, they did it for good reasons to protect against spammers and D/DoS attacks). The #kamailio channel on freenode.net will still be in use by the people that like it, there is no plan to consider it obsolete. One of the main benefits of running own matrix server is the ability to allow guest access during the devel online meetings, so people that do not want to create an account can still participate by using a web browser. Also, it offers modern encryption and privacy, along with richer collaboration features (e.g., file sharing), many considering it a viable open source alternative to Slack or other private team collaboration services. The first room created is #kamailio:matrix.kamailio.dev : * https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev The matrix server is federated, so you can join if you have an account on any other public federated matrix server or one that you can host yourself. The server on matrix.kamailio.dev is not allowing public registrations. If you are a registered developer (have git commit access) and need a matrix account, let us know and we will find solutions. It is the first phase now and based on the interest from the community, its usage can be increased (e.g., creating rooms for development notifications (commits, pull requests, issue); bridge to irc channel; etc...) or the server can be shut down if proves not useful. We will try to do the next online devel meeting (scheduled for Wednesday, April 29, 2020, at 14:00UTC) on the matrix chat room mentioned above. More details at: * https://www.kamailio.org/w/2020/04/matrix-chat-room-for-kamailio/ Stay safe and healthy! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:1292e40c: ims_usrloc_pcscf: fix value array size and compile warnings
by Daniel-Constantin Mierla 23 Apr '20

23 Apr '20

Module: kamailio Branch: master Commit: 1292e40c5260fa77d34db91abf7aacf47549d5e2 URL: https://github.com/kamailio/kamailio/commit/1292e40c5260fa77d34db91abf7aacf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-23T10:21:22+02:00 ims_usrloc_pcscf: fix value array size and compile warnings --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/1292e40c5260fa77d34db91abf7aacf… Patch: https://github.com/kamailio/kamailio/commit/1292e40c5260fa77d34db91abf7aacf… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 1ac55734d7..e597a0daf4 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -123,8 +123,9 @@ void free_security(security_t* _p) return; } - if(_p->sec_header.s) + if(_p->sec_header.s) { shm_free(_p->sec_header.s); + } switch (_p->type) { @@ -144,8 +145,9 @@ void free_security(security_t* _p) break; case SECURITY_TLS: - if(_p->data.tls) + if(_p->data.tls) { shm_free(_p->data.tls); + } break; case SECURITY_NONE: diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.c b/src/modules/ims_usrloc_pcscf/usrloc_db.c index ba71673e44..ca57a2b4b3 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.c @@ -213,7 +213,7 @@ int db_update_pcontact(pcontact_t* _c) int db_delete_pcontact(pcontact_t* _c) { LM_DBG("Trying to delete contact: aor[%.*s], received port %u\n", _c->aor.len, _c->aor.s, _c->received_port); - db_val_t values[1]; + db_val_t values[2]; db_key_t match_keys[2] = { &aor_col, &received_port_col }; VAL_TYPE(values) = DB1_STR;

1 0

git:master:b9b177cc: db_redis: var initialization and safety check to avoid compiler warnings
by Daniel-Constantin Mierla 23 Apr '20

23 Apr '20

Module: kamailio Branch: master Commit: b9b177ccffd58b11cf460764514486d29637dd55 URL: https://github.com/kamailio/kamailio/commit/b9b177ccffd58b11cf460764514486d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-23T09:57:05+02:00 db_redis: var initialization and safety check to avoid compiler warnings --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/b9b177ccffd58b11cf460764514486d… Patch: https://github.com/kamailio/kamailio/commit/b9b177ccffd58b11cf460764514486d… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index 4bed4e1c6d..a35e7dc786 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -491,7 +491,7 @@ int db_redis_parse_keys(km_redis_con_t *con) { char *start; char *end; - str table_name; + str table_name = str_init(""); str type_name; str column_name; str version_code; @@ -550,7 +550,8 @@ int db_redis_parse_keys(km_redis_con_t *con) { table_entry = str_hash_get(&con->tables, table_name.s, table_name.len); if (!table_entry) { - LM_ERR("No table schema found for table '%.*s', fix config by adding one to the 'schema' mod-param!\n", + LM_ERR("No table schema found for table '%.*s', fix config" + " by adding one to the 'schema' mod-param!\n", table_name.len, table_name.s); goto err; } @@ -558,6 +559,10 @@ int db_redis_parse_keys(km_redis_con_t *con) { table->version_code = version_code; break; case DBREDIS_KEYS_TYPE_ST: + if(!table) { + LM_ERR("invalid definition, table not set\n"); + goto err; + } while(p != end && *p != ':') ++p; if (p == end) { @@ -631,8 +636,6 @@ int db_redis_parse_keys(km_redis_con_t *con) { case DBREDIS_KEYS_END_ST: LM_DBG("done parsing keys definition\n"); return 0; - - } } while (p != end);

1 0

Release schedule
by Jeremy Kister 23 Apr '20

23 Apr '20

Victor recently fixed a problem I reported in #2288 and triggered a builds for kamailio-[dev|5.3|5.2|5.1]-nightly Is there a release schedule that shows me when I can expect the change in kamailio-53 ? apt considers the nightly release "5.3.3+0~20200417092406.72+bionic" as a downgrade from "5.3.3+bionic". -- Jeremy Kister https://jeremy.kister.net./

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev