sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

git:5.1:56e558a6: packaging: Fix typo in kamailio.spec

by Sergey Safarov

Module: kamailio Branch: 5.1 Commit: 56e558a6242d033c8372ce6559578339795d940c URL: https://github.com/kamailio/kamailio/commit/56e558a6242d033c8372ce655957833… Author: Edwin Fine <efine(a)users.noreply.github.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2019-03-21T20:26:53+03:00 packaging: Fix typo in kamailio.spec There is a number of occurrences of `%bcond_with|without rebbitmq`. Since the condition to include the `rabbitmq` package (line 633) is `%if %{with rabbitmq}`, this conditional statement would not have the intended effect. If this was not a deliberate typo for some reason, this commit fixes the issue by changing all `%bcond_with|without` occurrences of `rebbitmq` to `rabbitmq`. (cherry picked from commit 861c52ca6a9ca3bd6be5e89df92c1f65b46002f4) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/56e558a6242d033c8372ce655957833… Patch: https://github.com/kamailio/kamailio/commit/56e558a6242d033c8372ce655957833… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 2998872e6f..daf4c4007a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -16,7 +16,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -79,7 +79,7 @@ %bcond_without memcached %bcond_with mongodb %bcond_without perl -%bcond_with rebbitmq +%bcond_with rabbitmq %bcond_with redis %bcond_without sctp %bcond_without websocket @@ -101,7 +101,7 @@ %bcond_without memcached %bcond_without mongodb %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -122,7 +122,7 @@ %bcond_without memcached %bcond_with mongodb %bcond_without perl -%bcond_with rebbitmq +%bcond_with rabbitmq %bcond_without redis %bcond_without sctp %bcond_without websocket @@ -143,7 +143,7 @@ %bcond_with memcached %bcond_with mongodb %bcond_with perl -%bcond_with rebbitmq +%bcond_with rabbitmq %bcond_with redis %bcond_with sctp %bcond_with websocket @@ -164,7 +164,7 @@ %bcond_with memcached %bcond_without mongodb %bcond_without perl -%bcond_without rebbitmq +%bcond_without rabbitmq %bcond_without redis %bcond_with sctp %bcond_with websocket

5 years, 8 months

git:master:d9269f8d: etc/kamailio.cfg: do sanity check for sip responses

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d9269f8d9e745046558e57c3cd508130fda5a868 URL: https://github.com/kamailio/kamailio/commit/d9269f8d9e745046558e57c3cd50813… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-21T14:30:06+01:00 etc/kamailio.cfg: do sanity check for sip responses --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/d9269f8d9e745046558e57c3cd50813… Patch: https://github.com/kamailio/kamailio/commit/d9269f8d9e745046558e57c3cd50813… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 9b8cc526f7..851a3d0af8 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -310,6 +310,9 @@ modparam("jsonrpcs", "pretty_format", 1) /* set the path to RPC unix socket control file */ # modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") +# ----- sanity params ----- +modparam("sanity", "autodrop", 0) + # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) @@ -595,7 +598,7 @@ route[REQINIT] { } if(!sanity_check("17895", "7")) { - xlog("Malformed SIP message from $si:$sp\n"); + xlog("Malformed SIP request from $si:$sp\n"); exit; } } @@ -951,6 +954,14 @@ branch_route[MANAGE_BRANCH] { } # Manage incoming replies +reply_route { + if(!sanity_check("17604", "6")) { + xlog("Malformed SIP response from $si:$sp\n"); + drop; + } +} + +# Manage incoming replies in transaction context onreply_route[MANAGE_REPLY] { xdbg("incoming reply\n"); if(status=~"[12][0-9][0-9]") {

5 years, 8 months

git:master:8bba208f: etc/kamailio.cfg: no connect for forwarding requests withing dialog

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8bba208fe6ae7ccb4c92362b8c33f1530b9f56da URL: https://github.com/kamailio/kamailio/commit/8bba208fe6ae7ccb4c92362b8c33f15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-21T14:09:43+01:00 etc/kamailio.cfg: no connect for forwarding requests withing dialog - connections should be opened during the dialog creation and given that tcp/tls source port is is most of the cases ephemeral, trying to connect back fails --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/8bba208fe6ae7ccb4c92362b8c33f15… Patch: https://github.com/kamailio/kamailio/commit/8bba208fe6ae7ccb4c92362b8c33f15… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 6136926265..9b8cc526f7 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -556,6 +556,10 @@ route[RELAY] { route[REQINIT] { # no connect for sending replies set_reply_no_connect(); + if(has_totag()) { + # no connect for requests within dialog + set_forward_no_connect(); + } #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while @@ -826,7 +830,7 @@ route[NATMANAGE] { } if(isbflagset(FLB_NATB)) { - # message in a dialog involving NAT traversal - no connect + # no connect message in a dialog involving NAT traversal set_forward_no_connect(); } #!endif

5 years, 8 months

git:master:00ce103d: usrloc: safety checks for query result in db rpc functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 00ce103d24fcfca75ffc2ec4f3ea897fd516e61d URL: https://github.com/kamailio/kamailio/commit/00ce103d24fcfca75ffc2ec4f3ea897… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-21T13:48:25+01:00 usrloc: safety checks for query result in db rpc functions - GH #1900 --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/00ce103d24fcfca75ffc2ec4f3ea897… Patch: https://github.com/kamailio/kamailio/commit/00ce103d24fcfca75ffc2ec4f3ea897… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 53031799ac..3afad823d9 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -733,8 +733,8 @@ static void ul_rpc_db_users(rpc_t* rpc, void* ctx) str table = {0, 0}; char query[QUERY_LEN]; str query_str; - db1_res_t* res; - int count; + db1_res_t* res = NULL; + int count = 0; if (db_mode == NO_DB) { rpc->fault(ctx, 500, "Command is not supported in db_mode=0"); @@ -767,12 +767,13 @@ static void ul_rpc_db_users(rpc_t* rpc, void* ctx) domain_col.len, domain_col.s, table.len, table.s); query_str.s = query; - if (ul_dbf.raw_query(ul_dbh, &query_str, &res) < 0) { + if (ul_dbf.raw_query(ul_dbh, &query_str, &res) < 0 || res==NULL) { rpc->fault(ctx, 500, "Failed to query AoR count"); return; } - - count = (int)VAL_INT(ROW_VALUES(RES_ROWS(res))); + if (RES_ROW_N(res) > 0) { + count = (int)VAL_INT(ROW_VALUES(RES_ROWS(res))); + } ul_dbf.free_result(ul_dbh, res); rpc->add(ctx, "d", count); @@ -788,8 +789,8 @@ static void ul_rpc_db_contacts(rpc_t* rpc, void* ctx) str table = {0, 0}; char query[QUERY_LEN]; str query_str; - db1_res_t* res; - int count; + db1_res_t* res = NULL; + int count = 0; if (db_mode == NO_DB) { rpc->fault(ctx, 500, "Command is not supported in db_mode=0"); @@ -819,12 +820,14 @@ static void ul_rpc_db_contacts(rpc_t* rpc, void* ctx) query_str.len = snprintf(query, QUERY_LEN, "SELECT COUNT(*) FROM %.*s WHERE (UNIX_TIMESTAMP(expires) = 0) OR (expires > NOW())", table.len, table.s); query_str.s = query; - if (ul_dbf.raw_query(ul_dbh, &query_str, &res) < 0) { + if (ul_dbf.raw_query(ul_dbh, &query_str, &res) < 0 || res==NULL) { rpc->fault(ctx, 500, "Failed to query contact count"); return; } - count = (int)VAL_INT(ROW_VALUES(RES_ROWS(res))); + if (RES_ROW_N(res) > 0) { + count = (int)VAL_INT(ROW_VALUES(RES_ROWS(res))); + } ul_dbf.free_result(ul_dbh, res); rpc->add(ctx, "d", count); @@ -840,8 +843,8 @@ static void ul_rpc_db_expired_contacts(rpc_t* rpc, void* ctx) str table = {0, 0}; char query[QUERY_LEN]; str query_str; - db1_res_t* res; - int count; + db1_res_t* res = NULL; + int count = 0; if (db_mode == NO_DB) { rpc->fault(ctx, 500, "Command is not supported in db_mode=0"); @@ -871,12 +874,14 @@ static void ul_rpc_db_expired_contacts(rpc_t* rpc, void* ctx) query_str.len = snprintf(query, QUERY_LEN, "SELECT COUNT(*) FROM %.*s WHERE (UNIX_TIMESTAMP(expires) > 0) AND (expires <= NOW())", table.len, table.s); query_str.s = query; - if (ul_dbf.raw_query(ul_dbh, &query_str, &res) < 0) { + if (ul_dbf.raw_query(ul_dbh, &query_str, &res) < 0 || res==NULL) { rpc->fault(ctx, 500, "Failed to query contact count"); return; } - count = (int)VAL_INT(ROW_VALUES(RES_ROWS(res))); + if (RES_ROW_N(res) > 0) { + count = (int)VAL_INT(ROW_VALUES(RES_ROWS(res))); + } ul_dbf.free_result(ul_dbh, res); rpc->add(ctx, "d", count);

5 years, 8 months

[kamailio/kamailio] Hostname only (no ports) in the advertise parameter should be allowed (#1884)

by jklingenmeyer

### Description The `advertise` option in a `listen` parameter seems to only allow the following syntax: `advertise ip_or_host:port` The `advertise ip_or_host` syntax is not allowed and gives the following error: > CRITICAL: <core> [core/cfg.y:3507]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 49, column 1-6: ip address, interface name or hostname expected This can be blocking when using DNS SRV features in order to retrieve both host and port to send the SIP messages: when a port is present in the record-route/via headers no DNS SRV are done. So it prevents from doing some DNS-based load-balancing / failover things. ### Troubleshooting We get the same behaviour with using the deprecated `advertised_address` parameter: default port is set by Kamailio (because it is not possible to force a _null_ value for `advertised_port`) in the _Via_ header (but does not seem to affect the _R-R_ header). The advertised address can only be forced for the _Record-Route_ header using the `record_route_advertised_address` function in the script. ### Additional Information Tested with last Kamailio release on Debian 9.8 ``` version: kamailio 5.2.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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 with gcc 6.3.0 ``` -- 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/1884

5 years, 8 months

Re: [sr-dev] [SR-Users] IMS: ims_isc, ims_registrar_scscf: some additions for 3rd party registration

by Henning Westerholt

Am Mittwoch, 20. März 2019, 18:14:38 CET schrieb Valentin Christoph: (add sr-dev list to CC) Hello Christoph, thank you in advance for the contribution. > We had implemented a few additions for third party registration, based on > kamailio 5.1.0 IMS modules. > > * either service info OR original REGISTER request or original 200 OK > can be added as body to the 3rd party Registration Request, if indicated by > the HSS in the user data > * change: S-CSCF does not check for TEL URI, before it sends P-Associated > URI to AS (SIP URIs are also sent) > > We would like to provide a pull request within the next days or week to have > the changes as basis for a change in release 5.3.x. > > Drawback: probably our solution would need to be slightly modified, because > we removed the check for TEL URI, if the S-CSCF sends the P-Associated-URI > header to the AS in the 3rd party register request (maybe introduce a > module parameter?). > > Any comments? Would it be reviewed and maybe taken for 5.3? As the patch set is not yet available I can't comment much on the change right now. If your additions or extensions cause an in-compatible change to the existing behavior, the addition of a module parameter to control this is indeed recommended. Another option (e.g. if you extend a module function) is to provide a new version of the function with the new or changed behavior. We will review all pull requests. :-) If they add new functionality or extend existing functionality in a meaningful way they will be usually merged into git master. This is then the base for the next stable release 5.3. Looking forward to your pull request, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

5 years, 8 months

git:master:3036a53f: etc/kamailio.cfg: set no connect flags for replies and natted messages

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3036a53fbb999c89802ca97158c444e9a1e404d5 URL: https://github.com/kamailio/kamailio/commit/3036a53fbb999c89802ca97158c444e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-20T15:16:27+01:00 etc/kamailio.cfg: set no connect flags for replies and natted messages --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/3036a53fbb999c89802ca97158c444e… Patch: https://github.com/kamailio/kamailio/commit/3036a53fbb999c89802ca97158c444e… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 7462c9cdfd..6136926265 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -554,6 +554,9 @@ route[RELAY] { # Per SIP request initial checks route[REQINIT] { + # no connect for sending replies + set_reply_no_connect(); + #!ifdef WITH_ANTIFLOOD # flood detection from same IP and traffic ban for a while # be sure you exclude checking trusted peers, such as pstn gateways @@ -821,6 +824,11 @@ route[NATMANAGE] { set_contact_alias(); } } + + if(isbflagset(FLB_NATB)) { + # message in a dialog involving NAT traversal - no connect + set_forward_no_connect(); + } #!endif return; }

5 years, 8 months

git:master:32ad8b43: pkg/kamailio/deb: version set 5.3.0~dev4

by Victor Seva

Module: kamailio Branch: master Commit: 32ad8b43d5e07d014df0264f0e13f7f5ad8f18f9 URL: https://github.com/kamailio/kamailio/commit/32ad8b43d5e07d014df0264f0e13f7f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-03-20T09:04:05+01:00 pkg/kamailio/deb: version set 5.3.0~dev4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/32ad8b43d5e07d014df0264f0e13f7f… Patch: https://github.com/kamailio/kamailio/commit/32ad8b43d5e07d014df0264f0e13f7f…

5 years, 8 months

git:master:28da4b88: pkg/kamailio/deb: version set 5.3.0~dev3

by Victor Seva

Module: kamailio Branch: master Commit: 28da4b88720082325ae2f62be82faf31b1b445e9 URL: https://github.com/kamailio/kamailio/commit/28da4b88720082325ae2f62be82faf3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-03-20T09:02:01+01:00 pkg/kamailio/deb: version set 5.3.0~dev3 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/28da4b88720082325ae2f62be82faf3… Patch: https://github.com/kamailio/kamailio/commit/28da4b88720082325ae2f62be82faf3…

5 years, 8 months

git:master:3bbb1bab: xmlrpc: docs - section ids for functions and params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3bbb1bab788e96e4d9860bfb29890c3d80a218a7 URL: https://github.com/kamailio/kamailio/commit/3bbb1bab788e96e4d9860bfb29890c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-20T04:39:09+01:00 xmlrpc: docs - section ids for functions and params --- Modified: src/modules/xmlrpc/doc/xmlrpc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3bbb1bab788e96e4d9860bfb29890c3… Patch: https://github.com/kamailio/kamailio/commit/3bbb1bab788e96e4d9860bfb29890c3… --- diff --git a/src/modules/xmlrpc/doc/xmlrpc_admin.xml b/src/modules/xmlrpc/doc/xmlrpc_admin.xml index a61d63e6db..6c84dcb510 100644 --- a/src/modules/xmlrpc/doc/xmlrpc_admin.xml +++ b/src/modules/xmlrpc/doc/xmlrpc_admin.xml @@ -30,7 +30,7 @@ <section> <title>Parameters</title> - <section id="route"> + <section id="xmlrpc.p.route"> <title><varname>route</varname> (string)</title> <para> Name of the route called for XMLRPC messages. @@ -57,7 +57,7 @@ modparam("xmlrpc", "route", "route_for_xmlrpcs") </example> </section> - <section id="autoconversion"> + <section id="xmlrpc.p.autoconversion"> <title><varname>autoconversion</varname> (string)</title> <para> Enable or disable automatic parameter type conversion globally, @@ -83,7 +83,7 @@ modparam("xmlrpc", "autoconversion", 1) </example> </section> - <section id="escape_cr"> + <section id="xmlrpc.p.escape_cr"> <title><varname>escape_cr</varname> (integer)</title> <para> Enable CR ('\r') escaping in replies. If enabled each '\r' in the @@ -105,7 +105,7 @@ modparam("xmlrpc", "escape_cr", 1) </example> </section> - <section id="double_lf_to_crlf"> + <section id="xmlrpc.p.double_lf_to_crlf"> <title><varname>double_lf_to_crlf</varname> (integer)</title> <para> When enabled double LFs ('\n\n') in the input xmlrpc strings @@ -132,7 +132,7 @@ modparam("xmlrpc", "double_lf_to_crlf", 1) </example> </section> - <section id="param_mode"> + <section id="xmlrpc.p.mode"> <title><varname>mode</varname> (integer)</title> <para> When set to 1, the xmlrpc module does not register to core the callback @@ -150,7 +150,7 @@ modparam("xmlrpc", "mode", 1) </programlisting> </example> </section> - <section> + <section id="xmlrpc.p.url_skip"> <title><varname>url_skip</varname> (str)</title> <para> Regular expression to match the HTTP URL. If there is a match, @@ -170,7 +170,7 @@ modparam("xmlrpc", "url_skip", "^/sip") </programlisting> </example> </section> - <section> + <section id="xmlrpc.p.url_match"> <title><varname>url_match</varname> (str)</title> <para> Regular expression to match the HTTP URL. If there is no match, @@ -192,7 +192,7 @@ modparam("xmlrpc", "url_match", "^/RPC2") </programlisting> </example> </section> - <section id="event_callback"> + <section id="xmlrpc.pevent_callback"> <title><varname>event_callback</varname> (string)</title> <para> The name of the function in the kemi configuration file (embedded @@ -236,7 +236,7 @@ end <title>Functions</title> - <section id="xmlrpc.dispatch_rpc"> + <section id="xmlrpc.f.dispatch_rpc"> <title> <function>dispatch_rpc()</function> </title> @@ -274,7 +274,7 @@ route[XMLRPC]{ </example> </section> - <section id="xmlrpc.xmlrpc_reply"> + <section id="xmlrpc.f.xmlrpc_reply"> <title> <function>xmlrpc_reply(code, reason)</function> </title>

5 years, 8 months

← Newer
1
...
16
17
18
19
20
21
22
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019