sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
284 discussions

git:master:4ce48efb: ims_ipsec_pcscf: simplified parsing target uri for contact filling

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4ce48efbb7022dbb060173816577aed404689bb9 URL: https://github.com/kamailio/kamailio/commit/4ce48efbb7022dbb060173816577aed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T15:24:38+02:00 ims_ipsec_pcscf: simplified parsing target uri for contact filling --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/4ce48efbb7022dbb060173816577aed… Patch: https://github.com/kamailio/kamailio/commit/4ce48efbb7022dbb060173816577aed… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index cb2ad45ce2..18f5e3727a 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -169,26 +169,24 @@ static int fill_contact( if(m->first_line.type == SIP_REQUEST) { char *alias_start; struct sip_uri uri; + str suri; memset(&uri, 0, sizeof(struct sip_uri)); if((sflags & IPSEC_DSTADDR_SEARCH) && m->dst_uri.s!=NULL && m->dst_uri.len>0) { + suri = m->dst_uri; LM_DBG("using dst uri for contact filling: %.*s\n", - m->dst_uri.len, m->dst_uri.s); - if(parse_uri(m->dst_uri.s, m->dst_uri.len, &uri)<0) { - LM_ERR("failed to parse the request dst URI\n"); - return -1; - } + suri.len, suri.s); } else { + suri = m->first_line.u.request.uri; LM_DBG("using original uri for contact filling: %.*s\n", - m->first_line.u.request.uri.len, - m->first_line.u.request.uri.s); - if(parse_uri(m->first_line.u.request.uri.s, - m->first_line.u.request.uri.len, &uri)<0) { - LM_ERR("failed to parse the request URI from first line\n"); - return -1; - } + suri.len, suri.s); + } + if(parse_uri(suri.s, suri.len, &uri)<0) { + LM_ERR("failed to parse the URI: %.*s / flags: 0x%x\n", + suri.len, suri.s, sflags); + return -1; } req = m;

2 years

git:master:c0628e4e: ims_ipsec_pcscf: docs for new flag to use dst uri for ipsec tunnel search

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c0628e4e13bd95412e5f43dfe9a3e1d23aeebaaf URL: https://github.com/kamailio/kamailio/commit/c0628e4e13bd95412e5f43dfe9a3e1d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T15:18:35+02:00 ims_ipsec_pcscf: docs for new flag to use dst uri for ipsec tunnel search --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c0628e4e13bd95412e5f43dfe9a3e1d… Patch: https://github.com/kamailio/kamailio/commit/c0628e4e13bd95412e5f43dfe9a3e1d… --- diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index 2ed0e2104b..d7314fa3e6 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -281,8 +281,27 @@ ipsec_create("location", "1"); </para> <para> <emphasis>flags</emphasis> - bitwise flag: - 0x01 - set force socket for request messages. Useful for ipsec and TCP. - 0x02 - reverse search for a contact in the memory. Useful when contact alias is disabled. + <itemizedlist> + <listitem> + <para> + <emphasis>0x01</emphasis> - set force socket for request messages. Useful for ipsec and TCP. + </para> + </listitem> + <listitem> + <para> + <emphasis>0x02</emphasis> - reverse search for a contact in the memory. + Useful when contact alias is disabled. + </para> + </listitem> + <listitem> + <para> + <emphasis>0x04</emphasis> - use destination URI for IPSec tunnel search. Useful for + routing requests within dialog. + </para> + </listitem> + </itemizedlist> + </para> + <para> This is an optional parameter, default value - 0. </para> </listitem>

2 years

git:master:a851acca: ims_ipsec_pcscf: option to use dst address for tunnel search

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a851acca1c06daf847dc27ad31b0eb0ba7e93f4d URL: https://github.com/kamailio/kamailio/commit/a851acca1c06daf847dc27ad31b0eb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T15:18:35+02:00 ims_ipsec_pcscf: option to use dst address for tunnel search --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/a851acca1c06daf847dc27ad31b0eb0… Patch: https://github.com/kamailio/kamailio/commit/a851acca1c06daf847dc27ad31b0eb0… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 14e797c02b..cb2ad45ce2 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -76,13 +76,15 @@ const int IPSEC_CMD_SUCCESS = 1; extern usrloc_api_t ul; extern struct tm_binds tmb; -#define IPSEC_SEND_FORCE_SOCKET \ - 0x01 /* if set - set send force socket for request messages */ -#define IPSEC_REVERSE_SEARCH \ - 0x02 /* if set - start searching from the last element */ +/* if set - set send force socket for request messages */ +#define IPSEC_SEND_FORCE_SOCKET 0x01 +/* if set - start searching from the last element */ +#define IPSEC_REVERSE_SEARCH 0x02 +/* if set - use destination address for IPSec tunnel search */ +#define IPSEC_DSTADDR_SEARCH 0x04 -#define IPSEC_CREATE_DELETE_UNUSED_TUNNELS \ - 0x01 /* if set - delete unused tunnels before every registration */ +/* if set - delete unused tunnels before every registration */ +#define IPSEC_CREATE_DELETE_UNUSED_TUNNELS 0x01 int bind_ipsec_pcscf(ipsec_pcscf_api_t *api) { @@ -150,7 +152,7 @@ static str get_www_auth_param(const char *param_name, str www_auth) } static int fill_contact( - struct pcontact_info *ci, struct sip_msg *m, tm_cell_t *t) + pcontact_info_t *ci, sip_msg_t *m, tm_cell_t *t, int sflags) { contact_body_t *cb = NULL; struct via_body *vb = NULL; @@ -167,12 +169,26 @@ static int fill_contact( if(m->first_line.type == SIP_REQUEST) { char *alias_start; struct sip_uri uri; + memset(&uri, 0, sizeof(struct sip_uri)); - if(parse_uri(m->first_line.u.request.uri.s, - m->first_line.u.request.uri.len, &uri)) { - LM_ERR("Can't parse the request URI from first line\n"); - return -1; + if((sflags & IPSEC_DSTADDR_SEARCH) && m->dst_uri.s!=NULL + && m->dst_uri.len>0) { + LM_DBG("using dst uri for contact filling: %.*s\n", + m->dst_uri.len, m->dst_uri.s); + if(parse_uri(m->dst_uri.s, m->dst_uri.len, &uri)<0) { + LM_ERR("failed to parse the request dst URI\n"); + return -1; + } + } else { + LM_DBG("using original uri for contact filling: %.*s\n", + m->first_line.u.request.uri.len, + m->first_line.u.request.uri.s); + if(parse_uri(m->first_line.u.request.uri.s, + m->first_line.u.request.uri.len, &uri)<0) { + LM_ERR("failed to parse the request URI from first line\n"); + return -1; + } } req = m; @@ -673,7 +689,7 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) t = tmb.t_gett(); } // Find the contact - if(fill_contact(&ci, m, t) != 0) { + if(fill_contact(&ci, m, t, _cflags) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -828,7 +844,7 @@ int ipsec_forward(struct sip_msg *m, udomain_t *d, int _cflags) // // Find the contact // - if(fill_contact(&ci, m, t) != 0) { + if(fill_contact(&ci, m, t, _cflags) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -997,7 +1013,7 @@ int ipsec_destroy(struct sip_msg *m, udomain_t *d) } // Find the contact - if(fill_contact(&ci, m, t) != 0) { + if(fill_contact(&ci, m, t, 0) != 0) { LM_ERR("Error filling in contact data\n"); return ret; }

2 years

git:5.6:b0d6a66f: pkg/kamailio/obs: packaged siprepo module into RPM files

by Sergey Safarov

Module: kamailio Branch: 5.6 Commit: b0d6a66f1069f9eed5a3b551b9281dcd36fb9185 URL: https://github.com/kamailio/kamailio/commit/b0d6a66f1069f9eed5a3b551b9281dc… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-05-30T16:14:43+03:00 pkg/kamailio/obs: packaged siprepo module into RPM files (cherry picked from commit a812e490d3ba4245c2dba4f08d081a957fb5679b) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b0d6a66f1069f9eed5a3b551b9281dc… Patch: https://github.com/kamailio/kamailio/commit/b0d6a66f1069f9eed5a3b551b9281dc… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 10ada842b5..5ba68a9224 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1539,6 +1539,7 @@ fi %doc %{_docdir}/kamailio/modules/README.sdpops %doc %{_docdir}/kamailio/modules/README.seas %doc %{_docdir}/kamailio/modules/README.sipcapture +%doc %{_docdir}/kamailio/modules/README.siprepo %doc %{_docdir}/kamailio/modules/README.sipt %doc %{_docdir}/kamailio/modules/README.siptrace %doc %{_docdir}/kamailio/modules/README.siputils @@ -1699,6 +1700,7 @@ fi %{_libdir}/kamailio/modules/sdpops.so %{_libdir}/kamailio/modules/seas.so %{_libdir}/kamailio/modules/sipcapture.so +%{_libdir}/kamailio/modules/siprepo.so %{_libdir}/kamailio/modules/sipt.so %{_libdir}/kamailio/modules/siptrace.so %{_libdir}/kamailio/modules/siputils.so

2 years

git:master:a812e490: pkg/kamailio/obs: packaged siprepo module into RPM files

by Sergey Safarov

Module: kamailio Branch: master Commit: a812e490d3ba4245c2dba4f08d081a957fb5679b URL: https://github.com/kamailio/kamailio/commit/a812e490d3ba4245c2dba4f08d081a9… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-05-30T16:13:43+03:00 pkg/kamailio/obs: packaged siprepo module into RPM files --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a812e490d3ba4245c2dba4f08d081a9… Patch: https://github.com/kamailio/kamailio/commit/a812e490d3ba4245c2dba4f08d081a9… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5b87a501bcd..a2b7e1406c8 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1539,6 +1539,7 @@ fi %doc %{_docdir}/kamailio/modules/README.sdpops %doc %{_docdir}/kamailio/modules/README.seas %doc %{_docdir}/kamailio/modules/README.sipcapture +%doc %{_docdir}/kamailio/modules/README.siprepo %doc %{_docdir}/kamailio/modules/README.sipt %doc %{_docdir}/kamailio/modules/README.siptrace %doc %{_docdir}/kamailio/modules/README.siputils @@ -1699,6 +1700,7 @@ fi %{_libdir}/kamailio/modules/sdpops.so %{_libdir}/kamailio/modules/seas.so %{_libdir}/kamailio/modules/sipcapture.so +%{_libdir}/kamailio/modules/siprepo.so %{_libdir}/kamailio/modules/sipt.so %{_libdir}/kamailio/modules/siptrace.so %{_libdir}/kamailio/modules/siputils.so

2 years

git:master:61b175bc: ims_usrloc_scscf: same type for init flag variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 61b175bcffed9492d6cc718c9ac70c4378712807 URL: https://github.com/kamailio/kamailio/commit/61b175bcffed9492d6cc718c9ac70c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T13:19:40+02:00 ims_usrloc_scscf: same type for init flag variable - it was defined as int but the extern declaration was unsigned - added ims_ulp_ prefix to avoid global scope conflict with other modules --- Modified: src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c Modified: src/modules/ims_usrloc_scscf/usrloc.c --- Diff: https://github.com/kamailio/kamailio/commit/61b175bcffed9492d6cc718c9ac70c4… Patch: https://github.com/kamailio/kamailio/commit/61b175bcffed9492d6cc718c9ac70c4… --- diff --git a/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c index bb5c394704..1a82d6bcc8 100644 --- a/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c +++ b/src/modules/ims_usrloc_scscf/ims_usrloc_scscf_mod.c @@ -116,7 +116,7 @@ str db_url = str_init(DEFAULT_DB_URL); /*!< Database URL */ /* flags */ unsigned int nat_bflag = (unsigned int)-1; -unsigned int init_flag = 0; +unsigned int ims_uls_init_flag = 0; ims_dlg_api_t dlgb; @@ -380,7 +380,7 @@ static int mod_init(void) { nat_bflag = 1 << nat_bflag; } - init_flag = 1; + ims_uls_init_flag = 1; /* From contact_dlg_handlers.c * diff --git a/src/modules/ims_usrloc_scscf/usrloc.c b/src/modules/ims_usrloc_scscf/usrloc.c index 068d9f69f2..06a082ebaa 100644 --- a/src/modules/ims_usrloc_scscf/usrloc.c +++ b/src/modules/ims_usrloc_scscf/usrloc.c @@ -55,7 +55,7 @@ /*! nat branch flag */ extern unsigned int nat_bflag; /*! flag to protect against wrong initialization */ -extern unsigned int init_flag; +extern unsigned int ims_uls_init_flag; /*! * \brief usrloc module API export bind function @@ -67,7 +67,7 @@ int bind_usrloc(usrloc_api_t* api) { LM_ERR("invalid parameter value\n"); return -1; } - if (init_flag == 0) { + if (ims_uls_init_flag == 0) { LM_ERR("configuration error - trying to bind to usrloc module" " before being initialized\n"); return -1;

2 years

git:master:44b46535: ims_usrloc_pcscf: same type for init flag variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 44b465350faa5f640262b693dfbb7959921b4cea URL: https://github.com/kamailio/kamailio/commit/44b465350faa5f640262b693dfbb795… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T13:16:07+02:00 ims_usrloc_pcscf: same type for init flag variable - it was defined as int but the extern declaration was unsigned - added ims_ulp_ prefix to avoid global scope conflict with other modules --- Modified: src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c Modified: src/modules/ims_usrloc_pcscf/usrloc.c --- Diff: https://github.com/kamailio/kamailio/commit/44b465350faa5f640262b693dfbb795… Patch: https://github.com/kamailio/kamailio/commit/44b465350faa5f640262b693dfbb795… --- diff --git a/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c index fe9a1f5f02..26aaa2773b 100644 --- a/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c +++ b/src/modules/ims_usrloc_pcscf/ims_usrloc_pcscf_mod.c @@ -77,13 +77,13 @@ int expires_grace = 3600; //default is a grace period of 1 hour - after this c * Module parameters and their default values */ str usrloc_debug_file = str_init(DEFAULT_DBG_FILE); -int usrloc_debug = 0; -int ul_hash_size = 9; -int init_flag = 0; -str db_url = str_init(DEFAULT_DB_URL); /*!< Database URL */ -int timer_interval = 60; /*!< Timer interval in seconds */ -int db_mode = 0; /*!< Database sync scheme: 0-no db, 1-write through, 2-write back, 3-only db */ -int ul_fetch_rows = 2000; +int usrloc_debug = 0; +int ul_hash_size = 9; +int ims_ulp_init_flag = 0; +str db_url = str_init(DEFAULT_DB_URL); /*!< Database URL */ +int timer_interval = 60; /*!< Timer interval in seconds */ +int db_mode = 0; /*!< Database sync scheme: 0-no db, 1-write through, 2-write back, 3-only db */ +int ul_fetch_rows = 2000; int match_contact_host_port = 1; /*!< Should we match contact just based on rui host and port*/ db1_con_t* ul_dbh = 0; @@ -198,7 +198,7 @@ static int mod_init(void) { LM_DBG("Running in DB mode %i\n", db_mode); } - init_flag = 1; + ims_ulp_init_flag = 1; return 0; } diff --git a/src/modules/ims_usrloc_pcscf/usrloc.c b/src/modules/ims_usrloc_pcscf/usrloc.c index 66c37ffe5f..418e1859bc 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc.c +++ b/src/modules/ims_usrloc_pcscf/usrloc.c @@ -51,14 +51,14 @@ #include "ims_usrloc_pcscf_mod.h" #include "../../core/parser/parse_uri.h" -extern unsigned int init_flag; +extern int ims_ulp_init_flag; int bind_usrloc(usrloc_api_t* api) { if (!api) { LM_ERR("invalid parameter value\n"); return -1; } - if (init_flag == 0) { + if (ims_ulp_init_flag == 0) { LM_ERR("configuration error - trying to bind to usrloc module" " before being initialized\n"); return -1;

2 years

git:master:3ba676e9: ims_ipsec_pcscf: same type for init flag variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3ba676e9776b8fea8e64eeb8ea7520ab83b8702c URL: https://github.com/kamailio/kamailio/commit/3ba676e9776b8fea8e64eeb8ea7520a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T13:09:18+02:00 ims_ipsec_pcscf: same type for init flag variable - it was defined as int but the extern declaration was unsigned - added ipsec_ prefix to avoid global scope conflict with other modules --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3ba676e9776b8fea8e64eeb8ea7520a… Patch: https://github.com/kamailio/kamailio/commit/3ba676e9776b8fea8e64eeb8ea7520a… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index d48e280114..14e797c02b 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -67,7 +67,7 @@ extern ip_addr_t ipsec_listen_ip_addr6; extern int spi_id_start; -extern unsigned int init_flag; +extern unsigned int ipsec_init_flag; // check http://www.asipto.com/pub/kamailio-devel-guide/#c16return_values const int IPSEC_CMD_FAIL = -1; @@ -90,7 +90,7 @@ int bind_ipsec_pcscf(ipsec_pcscf_api_t *api) LM_ERR("invalid parameter value\n"); return -1; } - if(init_flag == 0) { + if(ipsec_init_flag == 0) { LM_ERR("configuration error - trying to bind to ipsec pscscf module " "before being initialized\n"); return -1; diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index b088a8af7f..20e5e1c97b 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -65,7 +65,7 @@ static int free_uint_fixup(void **param, int param_no); extern int bind_ipsec_pcscf(usrloc_api_t *api); -int init_flag = 0; +unsigned int ipsec_init_flag = 0; /* clang-format off */ @@ -363,7 +363,7 @@ static int mod_init(void) return -1; } - init_flag = 1; + ipsec_init_flag = 1; return 0; }

2 years

git:master:a4cba5ee: ims_ipsec_pcscf: clang-format for coherent indentation and coding style

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a4cba5eea619a62d722170ff92f4324c3e4e90cb URL: https://github.com/kamailio/kamailio/commit/a4cba5eea619a62d722170ff92f4324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-30T12:58:18+02:00 ims_ipsec_pcscf: clang-format for coherent indentation and coding style --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/cmd.h Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c Modified: src/modules/ims_ipsec_pcscf/ipsec.h Modified: src/modules/ims_ipsec_pcscf/sec_agree.c Modified: src/modules/ims_ipsec_pcscf/sec_agree.h Modified: src/modules/ims_ipsec_pcscf/spi_gen.c Modified: src/modules/ims_ipsec_pcscf/spi_gen.h Modified: src/modules/ims_ipsec_pcscf/spi_list.c Modified: src/modules/ims_ipsec_pcscf/spi_list.h Modified: src/modules/ims_ipsec_pcscf/spi_list_tests.c --- Diff: https://github.com/kamailio/kamailio/commit/a4cba5eea619a62d722170ff92f4324… Patch: https://github.com/kamailio/kamailio/commit/a4cba5eea619a62d722170ff92f4324…

2 years

[kamailio/kamailio] mhomed not working for tls destination (Issue #3124)

by Aidar

### Description Hello, I have faced an issue when mhomed working well only for udp destinations, and I believe that it is a bug. I have kamailio behind NAT with two network interfaces and I make a call from a softphone to kamailio and change $rd on kamailio side. If kamailio forward call to the UDP destination, mhomed option chooses the correct Via and the correct interface for sending. But if the destination is tls, mhomed chooses first described listen interface from the config file (as described in the documentation. #### The example So in my example when I call to sip:111@kamailio_ip kamailio going to send this call to $rd="1.1.1.1" and set Via and Record-Route to 10.0.0.32 (it is ok, because IP route to 1.1.1.1 via 10.0.0.32) when I call to sip:1111@kamailio_ip kamailio going to send this call to $rd="192.168.10.100:5061;transport=tls" BUT set Via and Record-Route to 10.0.0.32 (this is wrong because IP route to 192.168.10.100 is 192.168.10.145), but if in config file the first listen interface is 192.168.10.145, kamailio sends Via correct. #### Networking <img width="743" alt="image" src="https://user-images.githubusercontent.com/1487709/170417427-573f4038-b214-4…"> <img width="511" alt="image" src="https://user-images.githubusercontent.com/1487709/170417453-0a3925bf-bab4-4…"> #### Kamailio config ``` auto_aliases=yes mhomed=1 tcp_connection_match=1 # I have tried with and without this option listen=udp:10.0.0.32:5060 listen=tls:10.0.0.32:5061 listen=udp:192.168.10.145:5060 listen=tls:192.168.10.145:5061 ..... modparam("rr", "enable_full_lr", 1) modparam("rr", "append_fromtag", 1) #modparam("rr", "enable_double_rr", 2) # I have tried with and without this option ..... # routing if $rU == "111" { $rd="1.1.1.1"; } else { $rd="192.168.10.100:5061;transport=tls"; } route(RELAY); ``` #### Reproduction I have created a testing stand with almost default kamailio config so I can give full ssh access if you need it. I just call from linphone to sip:111@server_ip and sip:1111@server_ip #### SIP Traffic <img width="554" alt="image" src="https://user-images.githubusercontent.com/1487709/170420217-882d236b-243f-4…"> ``` INVITE sip:111@1.1.1.1 SIP/2.0 Record-Route: <sip:10.0.0.32;lr=on;ftag=GRIfZymtj;nat=yes> Via: SIP/2.0/UDP 10.0.0.32;branch=z9hG4bKc662.d4fa02b9991c45869263fc4359af8d84.0 Via: SIP/2.0/UDP 10.5.7.0:52360;received=210.1.88.115;branch=z9hG4bK.mH58YeIkv;rport=35775 From: <sip:akam@10.5.7.0>;tag=GRIfZymtj To: sip:111@130.61.43.152 CSeq: 20 INVITE Call-ID: FR3BLskG9- Max-Forwards: 69 Supported: replaces, outbound, gruu Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO, PRACK, UPDATE Content-Type: application/sdp Content-Length: 613 ``` <img width="584" alt="image" src="https://user-images.githubusercontent.com/1487709/170420360-a7889e57-b072-4…"> ``` INVITE sip:1111@192.168.10.100:5061;transport=tls SIP/2.0 Record-Route: <sip:10.0.0.32:5061;transport=tls;r2=on;lr=on;ftag=cIRc7nj00;nat=yes> Record-Route: <sip:10.0.0.32;r2=on;lr=on;ftag=cIRc7nj00;nat=yes> Via: SIP/2.0/TLS 10.0.0.32:5061;branch=z9hG4bK6a2.4ff69c3e304e238936a5528da681cd49.0 Via: SIP/2.0/UDP 10.5.7.0:52360;received=210.1.88.115;branch=z9hG4bK.BPohOzqtI;rport=35775 From: <sip:akam@10.5.7.0>;tag=cIRc7nj00 To: sip:1111@130.61.43.152 CSeq: 20 INVITE Call-ID: 40PEbKneY0 ``` ### Additional Information ``` root@mhomed-tls:/etc/kamailio# kamailio -v version: kamailio 5.5.4 (x86_64/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_BLOCKLIST, 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 with gcc 9.3.0 ``` * **Operating System**: ``` Ubuntu 20.04.4 LTS ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3124 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3124(a)github.com>

2 years

← Newer
1
...
10
11
12
13
14
15
16
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2022