sr-dev

sr-dev@lists.kamailio.org

21 participants
45185 discussions

git:master:adf7fb26: avpops: export functions to KEMI
by Victor Seva 15 Jun '20

15 Jun '20

Module: kamailio Branch: master Commit: adf7fb2613c4117ea0a76463d2df55e14579da9f URL: https://github.com/kamailio/kamailio/commit/adf7fb2613c4117ea0a76463d2df55e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-15T19:21:25+02:00 avpops: export functions to KEMI * avp_check * avp_copy --- Modified: src/modules/avpops/avpops.c --- Diff: https://github.com/kamailio/kamailio/commit/adf7fb2613c4117ea0a76463d2df55e… Patch: https://github.com/kamailio/kamailio/commit/adf7fb2613c4117ea0a76463d2df55e…

1 0

git:master:3a8896ce: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 15 Jun '20

15 Jun '20

Module: kamailio Branch: master Commit: 3a8896ce9e5a841087e43f6f384858799f590475 URL: https://github.com/kamailio/kamailio/commit/3a8896ce9e5a841087e43f6f3848587… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-15T15:31:10+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/3a8896ce9e5a841087e43f6f3848587… Patch: https://github.com/kamailio/kamailio/commit/3a8896ce9e5a841087e43f6f3848587… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 1e8ee06460..96891336b5 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -99,6 +99,7 @@ Gabriel Vasile 4.33. contact_param_encode(pname, saddr) 4.34. contact_param_decode(pname) 4.35. contact_param_decode_uri(pname) + 4.36. contact_param_rm(pname) 5. Exported pseudo-variables @@ -154,6 +155,7 @@ Gabriel Vasile 1.42. contact_param_encode usage 1.43. contact_param_decode usage 1.44. contact_param_decode_ruri usage + 1.45. contact_param_rm usage Chapter 1. Admin Guide @@ -214,6 +216,7 @@ Chapter 1. Admin Guide 4.33. contact_param_encode(pname, saddr) 4.34. contact_param_decode(pname) 4.35. contact_param_decode_uri(pname) + 4.36. contact_param_rm(pname) 5. Exported pseudo-variables @@ -432,6 +435,7 @@ modparam("auth", "rpid_avp", "$avp(myrpid)") 4.33. contact_param_encode(pname, saddr) 4.34. contact_param_decode(pname) 4.35. contact_param_decode_uri(pname) + 4.36. contact_param_rm(pname) 4.1. ring_insert_callid() @@ -1037,6 +1041,23 @@ if (is_method("INVITE") and src_ip == 1.2.3.4) { } ... +4.36. contact_param_rm(pname) + + This function removes the parameter from the URIs inside the Contact + headers. + + Meaning of the parameters is as follows: + * pname - name of the URI parameter. + + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE. + + Example 1.45. contact_param_rm usage +... +if (is_method("REGISTER") and src_ip == 1.2.3.4) { + contact_param_rm("myparam"); +} +... + 5. Exported pseudo-variables 5.1. $pcv(all)

1 0

git:master:af15f326: siputils: new function contact_param_rm("param-name")
by Daniel-Constantin Mierla 15 Jun '20

15 Jun '20

Module: kamailio Branch: master Commit: af15f32669fb482984ee5aefcc52e1a993691060 URL: https://github.com/kamailio/kamailio/commit/af15f32669fb482984ee5aefcc52e1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-15T15:18:55+02:00 siputils: new function contact_param_rm("param-name") - remove parameter by name from Contact header URI --- Modified: src/modules/siputils/contact_ops.c Modified: src/modules/siputils/contact_ops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/af15f32669fb482984ee5aefcc52e1a… Patch: https://github.com/kamailio/kamailio/commit/af15f32669fb482984ee5aefcc52e1a…

1 0

git:master:8616db85: siputils: docs for contact_param_rm()
by Daniel-Constantin Mierla 15 Jun '20

15 Jun '20

Module: kamailio Branch: master Commit: 8616db8573b7d83b81c4177ac855a1fcbd792445 URL: https://github.com/kamailio/kamailio/commit/8616db8573b7d83b81c4177ac855a1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-15T15:18:55+02:00 siputils: docs for contact_param_rm() --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8616db8573b7d83b81c4177ac855a1f… Patch: https://github.com/kamailio/kamailio/commit/8616db8573b7d83b81c4177ac855a1f… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 13b30ba447..6054ddf300 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1253,6 +1253,35 @@ if (is_method("INVITE") and src_ip == 1.2.3.4) { contact_param_decode_ruri("ksu"); } ... +</programlisting> + </example> + </section> + <section id="siputils.f.contact_param_rm"> + <title> + <function moreinfo="none">contact_param_rm(pname)</function> + </title> + <para> + This function removes the parameter from the URIs inside the Contact + headers. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>pname</emphasis> - name of the URI parameter. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE. + </para> + <example> + <title><function>contact_param_rm</function> usage</title> + <programlisting format="linespecific"> +... +if (is_method("REGISTER") and src_ip == 1.2.3.4) { + contact_param_rm("myparam"); +} +... </programlisting> </example> </section>

1 0

git:master:c5115cfb: pkg/kamailio/deb: version set 5.4.0~dev5
by Victor Seva 15 Jun '20

15 Jun '20

Module: kamailio Branch: master Commit: c5115cfb9a676d319eaeb4940998abc2e30acf03 URL: https://github.com/kamailio/kamailio/commit/c5115cfb9a676d319eaeb4940998abc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-15T10:20:51+02:00 pkg/kamailio/deb: version set 5.4.0~dev5 --- 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/c5115cfb9a676d319eaeb4940998abc… Patch: https://github.com/kamailio/kamailio/commit/c5115cfb9a676d319eaeb4940998abc…

1 0

git:master:5721cfc8: Makefile.defs: version set to 5.4.0-dev5
by Daniel-Constantin Mierla 15 Jun '20

15 Jun '20

Module: kamailio Branch: master Commit: 5721cfc82b74082e2f5f74ca19271e63a466c8f2 URL: https://github.com/kamailio/kamailio/commit/5721cfc82b74082e2f5f74ca19271e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-15T09:31:09+02:00 Makefile.defs: version set to 5.4.0-dev5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/5721cfc82b74082e2f5f74ca19271e6… Patch: https://github.com/kamailio/kamailio/commit/5721cfc82b74082e2f5f74ca19271e6… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9efb93704a..ac41fb432b 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -dev5 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:c5acc588: db_mysql: use MARIADB_BASE_VERSION macro to check for MariaDB library
by Daniel-Constantin Mierla 15 Jun '20

15 Jun '20

Module: kamailio Branch: master Commit: c5acc58863acb133748ad9f2f8a963ab714af871 URL: https://github.com/kamailio/kamailio/commit/c5acc58863acb133748ad9f2f8a963a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-15T09:09:53+02:00 db_mysql: use MARIADB_BASE_VERSION macro to check for MariaDB library --- Modified: src/modules/db_mysql/km_my_con.c Modified: src/modules/db_mysql/my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/c5acc58863acb133748ad9f2f8a963a… Patch: https://github.com/kamailio/kamailio/commit/c5acc58863acb133748ad9f2f8a963a… --- 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

1 0

dialog: reason behind not storing early state dialogs in db
by Victor Seva 14 Jun '20

14 Jun '20

Hi, is there a known reason not to store early state dialogs in db? I have some logic relaying on event_route exported by dialog module and that logic breaks for non confirmed dialogs when a switch-over happens since those dialogs are not loaded from db. Thanks in advance, Victor

4 8

git:master:5a65288c: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 14 Jun '20

14 Jun '20

Module: kamailio Branch: master Commit: 5a65288cac3d4dda5b3c7f6f496cf2f8551e294d URL: https://github.com/kamailio/kamailio/commit/5a65288cac3d4dda5b3c7f6f496cf2f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-14T17:16:10+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/5a65288cac3d4dda5b3c7f6f496cf2f… Patch: https://github.com/kamailio/kamailio/commit/5a65288cac3d4dda5b3c7f6f496cf2f…

1 0

git:master:6b278444: dialog: fix error in debug logging, properly log both sockets
by Henning Westerholt 14 Jun '20

14 Jun '20

Module: kamailio Branch: master Commit: 6b27844460e0de475d9546db122ff1ba9d9be6d8 URL: https://github.com/kamailio/kamailio/commit/6b27844460e0de475d9546db122ff1b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-14T15:13:31Z dialog: fix error in debug logging, properly log both sockets --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/6b27844460e0de475d9546db122ff1b… Patch: https://github.com/kamailio/kamailio/commit/6b27844460e0de475d9546db122ff1b… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 1325469675..1bfcb2cad7 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -870,8 +870,10 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) SET_STR_VALUE(values+6, cell->tag[DLG_CALLEE_LEG]); SET_PROPER_NULL_FLAG(cell->tag[DLG_CALLEE_LEG], values, 6); - LM_DBG("sock_info is %.*s\n", + LM_DBG("caller sock_info is %.*s, callee sock_info is %.*s\n", cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLER_LEG]->sock_str.s, + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev