sr-dev June 2020

sr-dev@lists.kamailio.org

24 participants
395 discussions

git:5.3:9dff6197: pv: use SIP_REQUEST/SIP_REPLY for value of $mt

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 9dff6197dcae5c4051194753382f95c5edaa379e URL: https://github.com/kamailio/kamailio/commit/9dff6197dcae5c4051194753382f95c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:15:38+02:00 pv: use SIP_REQUEST/SIP_REPLY for value of $mt (cherry picked from commit 7e402da261e1ced56019037d3dce9e72b5b2b0ea) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/9dff6197dcae5c4051194753382f95c… Patch: https://github.com/kamailio/kamailio/commit/9dff6197dcae5c4051194753382f95c… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 9087fe01bf..d4ae29bc9e 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -188,9 +188,9 @@ int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, return -1; if(msg->first_line.type == SIP_REQUEST) - type = 1; + type = SIP_REQUEST; /* 1 */ else if(msg->first_line.type == SIP_REPLY) - type = 2; + type = SIP_REPLY; /* 2 */ return pv_get_uintval(msg, param, res, type); }

4 years, 6 months

git:5.3:0f90c016: db_mysql: use MARIADB_BASE_VERSION macro to check for MariaDB library

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 0f90c016a4591bc2768731bd583235aea1348455 URL: https://github.com/kamailio/kamailio/commit/0f90c016a4591bc2768731bd583235a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:14:49+02:00 db_mysql: use MARIADB_BASE_VERSION macro to check for MariaDB library (cherry picked from commit c5acc58863acb133748ad9f2f8a963ab714af871) --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/0f90c016a4591bc2768731bd583235a… Patch: https://github.com/kamailio/kamailio/commit/0f90c016a4591bc2768731bd583235a… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index edfbb58caf..fb4f7dd5af 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -51,7 +51,6 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) struct my_con* ptr; char *host, *grp, *egrp; unsigned int connection_flag = 0; - unsigned int optuint = 0; #if MYSQL_VERSION_ID > 50012 #if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION @@ -116,9 +115,9 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void*)&db_mysql_timeout_interval); -#ifndef LIBMARIADB -#if MYSQL_VERSION_ID > 50710 +#if MYSQL_VERSION_ID > 50710 && !defined(MARIADB_BASE_VERSION) if(db_mysql_opt_ssl_mode!=0) { + unsigned int optuint = 0; if(db_mysql_opt_ssl_mode==1) { if(db_mysql_opt_ssl_mode!=SSL_MODE_DISABLED) { LM_WARN("ssl mode disabled is not 1 (value %u) - enforcing\n", @@ -132,18 +131,11 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) } #else if(db_mysql_opt_ssl_mode!=0) { - optuint = (unsigned int)db_mysql_opt_ssl_mode; LM_WARN("ssl mode not supported by mysql version (value %u) - ignoring\n", - optuint); - } -#endif -#else - if(db_mysql_opt_ssl_mode!=0) { - optuint = (unsigned int)db_mysql_opt_ssl_mode; - LM_WARN("ssl mode not supported by mariadb (value %u) - ignoring\n", - optuint); + (unsigned int)db_mysql_opt_ssl_mode); } #endif + #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */ if (db_mysql_auto_reconnect) { diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index df4d2df9db..2405468089 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -55,7 +55,6 @@ int my_con_connect(db_con_t* con) { struct my_con* mcon; struct my_uri* muri; - unsigned int optuint = 0; mcon = DB_GET_PAYLOAD(con); muri = DB_GET_PAYLOAD(con->uri); @@ -72,9 +71,9 @@ int my_con_connect(db_con_t* con) (const void*)&my_connect_to)) WARN("failed to set MYSQL_OPT_CONNECT_TIMEOUT\n"); } -#ifndef LIBMARIADB -#if MYSQL_VERSION_ID > 50710 +#if MYSQL_VERSION_ID > 50710 && !defined(MARIADB_BASE_VERSION) if(db_mysql_opt_ssl_mode!=0) { + unsigned int optuint = 0; if(db_mysql_opt_ssl_mode==1) { if(db_mysql_opt_ssl_mode!=SSL_MODE_DISABLED) { LM_WARN("ssl mode disabled is not 1 (value %u) - enforcing\n", @@ -88,16 +87,8 @@ int my_con_connect(db_con_t* con) } #else if(db_mysql_opt_ssl_mode!=0) { - optuint = (unsigned int)db_mysql_opt_ssl_mode; LM_WARN("ssl mode not supported by mysql version (value %u) - ignoring\n", - optuint); - } -#endif -#else - if(db_mysql_opt_ssl_mode!=0) { - optuint = (unsigned int)db_mysql_opt_ssl_mode; - LM_WARN("ssl mode not supported by mariadb (value %u) - ignoring\n", - optuint); + (unsigned int)db_mysql_opt_ssl_mode); } #endif

4 years, 6 months

git:5.3:0a5f69e8: db_mysql: note that libmariadbclient does not support ssl mode option

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 0a5f69e88d7d035a0966cbbe9c79b60163130c71 URL: https://github.com/kamailio/kamailio/commit/0a5f69e88d7d035a0966cbbe9c79b60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:14:31+02:00 db_mysql: note that libmariadbclient does not support ssl mode option (cherry picked from commit ae900a668aff4a472d6f1f7de5cf6277b5881ce9) --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0a5f69e88d7d035a0966cbbe9c79b60… Patch: https://github.com/kamailio/kamailio/commit/0a5f69e88d7d035a0966cbbe9c79b60… --- diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index 8f65f3675a..ffe10b14e6 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -199,6 +199,9 @@ modparam("db_mysql", "update_affected_found", 1) defined. </para> <para> + Note: this option is supported only by libmysqlclient, not by libmariadbclient. + </para> + <para> <emphasis> Default value is 0 (0 - off). </emphasis>

4 years, 6 months

git:5.3:88b1b6d1: db_mysql: mariadb client library does not support ssl mode option

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 88b1b6d164fbb1b487a9c0a441673e63d2928c43 URL: https://github.com/kamailio/kamailio/commit/88b1b6d164fbb1b487a9c0a441673e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:14:21+02:00 db_mysql: mariadb client library does not support ssl mode option (cherry picked from commit 5b727447df9f5476c2ef818a8926f62525d0c349) --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/88b1b6d164fbb1b487a9c0a441673e6… Patch: https://github.com/kamailio/kamailio/commit/88b1b6d164fbb1b487a9c0a441673e6… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index 324e707e5b..edfbb58caf 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -116,6 +116,7 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void*)&db_mysql_timeout_interval); +#ifndef LIBMARIADB #if MYSQL_VERSION_ID > 50710 if(db_mysql_opt_ssl_mode!=0) { if(db_mysql_opt_ssl_mode==1) { @@ -129,6 +130,19 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) } mysql_options(ptr->con, MYSQL_OPT_SSL_MODE, (const void*)&optuint); } +#else + if(db_mysql_opt_ssl_mode!=0) { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + LM_WARN("ssl mode not supported by mysql version (value %u) - ignoring\n", + optuint); + } +#endif +#else + if(db_mysql_opt_ssl_mode!=0) { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + LM_WARN("ssl mode not supported by mariadb (value %u) - ignoring\n", + optuint); + } #endif #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */ diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index 349595ee8f..df4d2df9db 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -72,6 +72,7 @@ int my_con_connect(db_con_t* con) (const void*)&my_connect_to)) WARN("failed to set MYSQL_OPT_CONNECT_TIMEOUT\n"); } +#ifndef LIBMARIADB #if MYSQL_VERSION_ID > 50710 if(db_mysql_opt_ssl_mode!=0) { if(db_mysql_opt_ssl_mode==1) { @@ -85,6 +86,19 @@ int my_con_connect(db_con_t* con) } mysql_options(mcon->con, MYSQL_OPT_SSL_MODE, (const void*)&optuint); } +#else + if(db_mysql_opt_ssl_mode!=0) { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + LM_WARN("ssl mode not supported by mysql version (value %u) - ignoring\n", + optuint); + } +#endif +#else + if(db_mysql_opt_ssl_mode!=0) { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + LM_WARN("ssl mode not supported by mariadb (value %u) - ignoring\n", + optuint); + } #endif #if MYSQL_VERSION_ID >= 40101

4 years, 6 months

git:5.3:0fc0b643: db_mysql: docs for opt_ssl_mode parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 0fc0b643c655211ca0dfe12d560d1a8f9de284e6 URL: https://github.com/kamailio/kamailio/commit/0fc0b643c655211ca0dfe12d560d1a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:14:08+02:00 db_mysql: docs for opt_ssl_mode parameter (cherry picked from commit f012c525264ed05fec2acb4b3924d4b9a1cd3ab9) --- Modified: src/modules/db_mysql/doc/db_mysql_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0fc0b643c655211ca0dfe12d560d1a8… Patch: https://github.com/kamailio/kamailio/commit/0fc0b643c655211ca0dfe12d560d1a8… --- diff --git a/src/modules/db_mysql/doc/db_mysql_admin.xml b/src/modules/db_mysql/doc/db_mysql_admin.xml index 69b81d33d7..8f65f3675a 100644 --- a/src/modules/db_mysql/doc/db_mysql_admin.xml +++ b/src/modules/db_mysql/doc/db_mysql_admin.xml @@ -182,6 +182,36 @@ modparam("db_mysql", "update_affected_found", 1) </example> </section> </section> + <section id="db_mysql.p.opt_ssl_mode"> + <title><varname>opt_ssl_mode</varname> (integer)</title> + <para> + Control how the connection to MySQL server is done in regards to SSL/TLS. + If set to 1, SSL/TLS mode is disabled. + </para> + <para> + The 'include/mysql.h' starting with MySQL 5.7.11 defines the values for + this option as enum: 'mysql_ssl_mode { SSL_MODE_DISABLED=1, SSL_MODE_PREFERRED, + SSL_MODE_REQUIRED, SSL_MODE_VERIFY_CA, SSL_MODE_VERIFY_IDENTITY}'. + </para> + <para> + Note: if the value of this parameter is 1, it enforces SSL_MODE_DISABLED, + any other value is passed to the mysql_options(), not checking if it is + defined. + </para> + <para> + <emphasis> + Default value is 0 (0 - off). + </emphasis> + </para> + <example> + <title>Set <varname>opt_ssl_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_mysql", "opt_ssl_mode", 1) +... +</programlisting> + </example> + </section> <section> <title>Functions</title> <para>

4 years, 6 months

git:5.3:31c6199d: db_mysql: new parameter opt_ssl_mode - allow controling ssl mode

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 31c6199d2204629240980b29cec861679493ce77 URL: https://github.com/kamailio/kamailio/commit/31c6199d2204629240980b29cec8616… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:13:58+02:00 db_mysql: new parameter opt_ssl_mode - allow controling ssl mode - can disable or enforce use of ssl - some combinations of libmysqlclient and libssl1.1 can result in crashing when ssl/tls is used, even on 127.0.0.1, this param can be used to disable it (cherry picked from commit 260e25e15c4aa68533ee560bd8fcbdd5ee7b7d6f) --- Modified: src/modules/db_mysql/db_mysql.c Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/31c6199d2204629240980b29cec8616… Patch: https://github.com/kamailio/kamailio/commit/31c6199d2204629240980b29cec8616… --- diff --git a/src/modules/db_mysql/db_mysql.c b/src/modules/db_mysql/db_mysql.c index da130f1818..397372f5ac 100644 --- a/src/modules/db_mysql/db_mysql.c +++ b/src/modules/db_mysql/db_mysql.c @@ -45,6 +45,7 @@ unsigned int my_server_timezone = 0; /* Use FROM_UNIXTIME() for date conversion unsigned long my_client_ver = 0; int db_mysql_unsigned_type = 0; +int db_mysql_opt_ssl_mode = 0; struct mysql_counters_h mysql_cnts_h; counter_def_t mysql_cnt_defs[] = { @@ -100,6 +101,7 @@ static param_export_t params[] = { {"insert_delayed", INT_PARAM, &db_mysql_insert_all_delayed}, {"update_affected_found", INT_PARAM, &db_mysql_update_affected_found}, {"unsigned_type", PARAM_INT, &db_mysql_unsigned_type}, + {"opt_ssl_mode", PARAM_INT, &db_mysql_opt_ssl_mode}, {0, 0, 0} }; diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index bed21f92a7..324e707e5b 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -40,6 +40,8 @@ #include "../../core/ut.h" #include "db_mysql.h" +extern int db_mysql_opt_ssl_mode; + /*! \brief * Create a new connection structure, * open the MySQL connection and set reference count to 1 @@ -49,6 +51,8 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) struct my_con* ptr; char *host, *grp, *egrp; unsigned int connection_flag = 0; + unsigned int optuint = 0; + #if MYSQL_VERSION_ID > 50012 #if MYSQL_VERSION_ID > 80000 && ! defined MARIADB_BASE_VERSION bool rec; @@ -112,6 +116,20 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_options(ptr->con, MYSQL_OPT_CONNECT_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_READ_TIMEOUT, (const void*)&db_mysql_timeout_interval); mysql_options(ptr->con, MYSQL_OPT_WRITE_TIMEOUT, (const void*)&db_mysql_timeout_interval); +#if MYSQL_VERSION_ID > 50710 + if(db_mysql_opt_ssl_mode!=0) { + if(db_mysql_opt_ssl_mode==1) { + if(db_mysql_opt_ssl_mode!=SSL_MODE_DISABLED) { + LM_WARN("ssl mode disabled is not 1 (value %u) - enforcing\n", + SSL_MODE_DISABLED); + } + optuint = SSL_MODE_DISABLED; + } else { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + } + mysql_options(ptr->con, MYSQL_OPT_SSL_MODE, (const void*)&optuint); + } +#endif #if MYSQL_VERSION_ID > 50012 /* set reconnect flag if enabled */ if (db_mysql_auto_reconnect) { diff --git a/src/modules/db_mysql/my_con.c b/src/modules/db_mysql/my_con.c index f64a90f0aa..349595ee8f 100644 --- a/src/modules/db_mysql/my_con.c +++ b/src/modules/db_mysql/my_con.c @@ -31,6 +31,7 @@ #include <string.h> #include <time.h> +extern int db_mysql_opt_ssl_mode; /* * Close the connection and release memory @@ -54,6 +55,7 @@ int my_con_connect(db_con_t* con) { struct my_con* mcon; struct my_uri* muri; + unsigned int optuint = 0; mcon = DB_GET_PAYLOAD(con); muri = DB_GET_PAYLOAD(con->uri); @@ -70,6 +72,20 @@ int my_con_connect(db_con_t* con) (const void*)&my_connect_to)) WARN("failed to set MYSQL_OPT_CONNECT_TIMEOUT\n"); } +#if MYSQL_VERSION_ID > 50710 + if(db_mysql_opt_ssl_mode!=0) { + if(db_mysql_opt_ssl_mode==1) { + if(db_mysql_opt_ssl_mode!=SSL_MODE_DISABLED) { + LM_WARN("ssl mode disabled is not 1 (value %u) - enforcing\n", + SSL_MODE_DISABLED); + } + optuint = SSL_MODE_DISABLED; + } else { + optuint = (unsigned int)db_mysql_opt_ssl_mode; + } + mysql_options(mcon->con, MYSQL_OPT_SSL_MODE, (const void*)&optuint); + } +#endif #if MYSQL_VERSION_ID >= 40101 if ((my_client_ver >= 50025) ||

4 years, 6 months

git:master:30c84383: modules: readme files regenerated - sipdump ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 30c843836a34ad8e749d762b77ade6ebc987a55d URL: https://github.com/kamailio/kamailio/commit/30c843836a34ad8e749d762b77ade6e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-19T15:16:13+02:00 modules: readme files regenerated - sipdump ... [skip ci] --- Modified: src/modules/sipdump/README --- Diff: https://github.com/kamailio/kamailio/commit/30c843836a34ad8e749d762b77ade6e… Patch: https://github.com/kamailio/kamailio/commit/30c843836a34ad8e749d762b77ade6e…

4 years, 6 months

git:master:47bd211d: sipdump: docs - usage remarks about cleaning generated files

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47bd211da1474d8addbaf1df86627e11bb221ff4 URL: https://github.com/kamailio/kamailio/commit/47bd211da1474d8addbaf1df86627e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-19T15:09:51+02:00 sipdump: docs - usage remarks about cleaning generated files --- Modified: src/modules/sipdump/doc/sipdump_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/47bd211da1474d8addbaf1df86627e1… Patch: https://github.com/kamailio/kamailio/commit/47bd211da1474d8addbaf1df86627e1… --- diff --git a/src/modules/sipdump/doc/sipdump_admin.xml b/src/modules/sipdump/doc/sipdump_admin.xml index 1a3e1db271..3bdc59c965 100644 --- a/src/modules/sipdump/doc/sipdump_admin.xml +++ b/src/modules/sipdump/doc/sipdump_admin.xml @@ -294,5 +294,30 @@ event_route[sipdump:msg] { </section> </section> + <section> + <title>Usage Remarks</title> + <section id="sipdump.x.usage-remarks"> + <para> + Note that the files with the SIP traffic and metadata are not deleted + by the module itself. They have to be deleted explicitely by other + means, such as cron.d job, or using rtimer and exec modules. Next + examples shows how to delete the files older than 2 days using + &kamailio; modules. + </para> +<programlisting format="linespecific"> +... +loadmodule "rtimer.so +loadmodule "exec.so +... +modparam("rtimer", "timer", "name=tjobs;interval=300;mode=1;") +modparam("rtimer", "exec", "timer=tjobs;route=TCLEAN") +... +route[TCLEAN] { + exec_cmd("find /tmp -type f -name kamailio-sipdump-* -mtime +1 -delete &"); +} +... +</programlisting> + </section> + </chapter>

4 years, 6 months

[kamailio/kamailio] topos: missing Record-Route on 200 OK leaving the server (downstream) (#2364)

by Victor Seva

### Description Seems that topos is not adding Record-Route headers in this scenario. ### Troubleshooting #### Reproduction ![topos](https://user-images.githubusercontent.com/63080/85021978-ea173900-b172-11ea-95dc-2b3be27378e3.png) ![no_topos](https://user-images.githubusercontent.com/63080/85021983-eb486600-b172-11ea-8383-816799e6251b.png) #### Log Messages I've added some more debug to topos: https://paste.debian.net/1152674/ Full [kamailio-lb.log](https://github.com/kamailio/kamailio/files/4798522/kamaili… This is the part when processing of the 200 OK coming from PSTN(fake) ``` Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:868]: tps_response_received(): handling incoming response Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 127.0.0.1:5064;branch=z9hG4bKcf3d.49d855e2b5f83b9dff62c8a6b0cf23f8.0](80) - x_via2: [](0) - x_vbranch1: [z9hG4bKcf3d.49d855e2b5f83b9dff62c8a6b0cf23f8.0](46) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [](0) - s_rr: [](0) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_storage.c:126]: tps_storage_lock_get(): tps lock get: 220 Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:889]: tps_response_received(): loaded dialog a_uuid [atpsh-5eeb547f-3970-3] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_storage.c:391]: tps_storage_link_msg(): downstream: yes - acontact: [] - bcontact: [sip:127.0.2.1:50603;transport=UDP] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_storage.c:138]: tps_storage_lock_release(): tps lock release: 220 Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Via: SIP/2.0/UDP 127.0.0.1:5080;received=127.0.0.1;branch=z9hG4bKh2oO8aY.;rport=5080#015#012] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:910]: tps_response_received(): x_rr[] y_rr[] s_rr[<sip:127.0.0.1:5064;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>,<sip:127.0.0.1;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Record-Route: <sip:127.0.0.1:5064;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>,<sip:127.0.0.1;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>#015#012] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [P-SR-XBranch: z9hG4bKcf3d.49d855e2b5f83b9dff62c8a6b0cf23f8.0#015#012] Jun 18 13:48:35 sp1 lb[14702]: NOTICE: REPLY_FROM_OUTBOUND <script>: Reply from Outbound - S=200 - OK M=INVITE IP=«udp»:«127.0.2.1»:«50603» ID=«NGCP%invite_peerout_outbound_socket%///1-15281(a)127.126.0.xn--1_b2b-1-yna UA='<null>' DESTIP=«127.0.0.1»:«5064» Jun 18 13:48:35 sp1 lb[14702]: NOTICE: REPLY_FROM_OUTBOUND <script>: NATed reply detected - ID=«NGCP%invite_peerout_outbound_socket%///1-15281(a)127.126.0.xn--1_b2b-1-yna UA='<null>' Jun 18 13:48:35 sp1 lb[14702]: NOTICE: REPLY_FROM_OUTBOUND <script>: Sending reply from outbound, fs='«udp:127.0.0.1:5060»' du='«127.0.0.1»:«5080»' - ID=«NGCP%invite_peerout_outbound_socket%///1-15281(a)127.126.0.xn--1_b2b-1-yna UA='<null>' Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [topos_mod.c:514]: tps_execute_event_route(): executing event_route[topos:topos:msg-sending] (2) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:1038]: tps_response_sent(): handling outgoing response Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:376]: tps_pack_message(): compacted headers - x_via1: [SIP/2.0/UDP 127.0.0.1:5080;received=127.0.0.1;branch=z9hG4bKh2oO8aY.;rport=5080](79) - x_via2: [](0) - x_vbranch1: [z9hG4bKh2oO8aY.](15) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:485]: tps_pack_message(): compacted headers - a_rr: [](0) - b_rr: [<sip:127.0.0.1:5064;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>,<sip:127.0.0.1;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>](214) - s_rr: [](0) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:490]: tps_pack_message(): compacted headers - as_contact: [](0) - bs_contact: [](0) Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_storage.c:126]: tps_storage_lock_get(): tps lock get: 220 Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:1068]: tps_response_sent(): loaded branch a_uuid [atpsh-5eeb547f-3970-3] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_storage.c:138]: tps_storage_lock_release(): tps lock release: 220 Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:182]: tps_add_headers(): adding to headers(0) - [Contact: <sip:atpsh-5eeb547f-3970-3@127.0.0.1>#015#012] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_msg.c:1101]: tps_response_sent(): x_rr[] y_rr[] s_rr[<sip:127.0.0.1:5064;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>,<sip:127.0.0.1;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [tps_storage.c:391]: tps_storage_link_msg(): downstream: yes - acontact: [] - bcontact: [sip:127.0.2.1:50603;transport=UDP] Jun 18 13:48:35 sp1 lb[14702]: DEBUG: <null> topos [topos_mod.c:454]: tps_msg_sent(): new outbound buffer generated ``` ``` topos [tps_msg.c:910]: tps_response_received(): x_rr[] y_rr[] s_rr[<sip:127.0.0.1:5064;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>,<sip:127.0.0.1;r2=on;lr=on;ftag=5A412B38-5EEB5492000D683F-C3258700;ngcplb=yes;socket=udp:127.0.0.1:5064>] ``` proper Record-Route value is on `s_rr` but [here](https://github.com/kamailio/kamailio/blob/93ab0791b409b9a708a1c7ac5cc… uses `x_rr` that is empty in this case #### SIP Traffic pcap files for the same scenario with and without topos [no_topos.zip](https://github.com/kamailio/kamailio/files/4798553/no_topos.z… [topos.zip](https://github.com/kamailio/kamailio/files/4798577/topos.zip) ### Additional Information * **Kamailio Version** - output of `kamailio -v` This is Sipwise version based on 5.3.4, no patches on topos apart of the debug one. -- 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/2364

4 years, 6 months

[kamailio/kamailio] registrar: expires_range should not make expires < min_expires (#2365)

by Kristian Høgh

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  expires_range should not make expires smaller than min_expires. A valid value might be made to small, which triggers 423 when min_expires_mode is set to 1 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2365 -- Commit Summary -- * registrar: expires_range should not make expires < min_expires -- File Changes -- M src/modules/registrar/sip_msg.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2365.patch https://github.com/kamailio/kamailio/pull/2365.diff -- 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/pull/2365

4 years, 6 months

← Newer
1
...
17
18
19
20
21
22
23
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2020