- sr-dev - kamailio.org

git:master:4ee3a788: ims_ipsec_pcscf: docs updated for ipsec_forward()
by Daniel-Constantin Mierla 31 May '22

31 May '22

Module: kamailio Branch: master Commit: 4ee3a788bf60b9e2191766b7cf153a6d7d23bfbb URL: https://github.com/kamailio/kamailio/commit/4ee3a788bf60b9e2191766b7cf153a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-31T08:33:03+02:00 ims_ipsec_pcscf: docs updated for ipsec_forward() --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ee3a788bf60b9e2191766b7cf153a6… Patch: https://github.com/kamailio/kamailio/commit/4ee3a788bf60b9e2191766b7cf153a6… --- 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 d7314fa3e6..77a758b5c4 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 @@ -299,6 +299,11 @@ ipsec_create("location", "1"); routing requests within dialog. </para> </listitem> + <listitem> + <para> + <emphasis>0x08</emphasis> - use new R-URI for IPSec tunnel search. + </para> + </listitem> </itemizedlist> </para> <para>

1 0

git:master:13dbfe9d: ims_ipsec_pcscf: added option to search ipsec tunel by new r-uri
by Daniel-Constantin Mierla 31 May '22

31 May '22

Module: kamailio Branch: master Commit: 13dbfe9da2df3bd0ae21a3f1cbee90f2f47e470b URL: https://github.com/kamailio/kamailio/commit/13dbfe9da2df3bd0ae21a3f1cbee90f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-31T08:33:03+02:00 ims_ipsec_pcscf: added option to search ipsec tunel by new r-uri --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/13dbfe9da2df3bd0ae21a3f1cbee90f… Patch: https://github.com/kamailio/kamailio/commit/13dbfe9da2df3bd0ae21a3f1cbee90f… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 18f5e3727a..336395d4ca 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -82,6 +82,8 @@ extern struct tm_binds tmb; #define IPSEC_REVERSE_SEARCH 0x02 /* if set - use destination address for IPSec tunnel search */ #define IPSEC_DSTADDR_SEARCH 0x04 +/* if set - use new r-uri address for IPSec tunnel search */ +#define IPSEC_RURIADDR_SEARCH 0x08 /* if set - delete unused tunnels before every registration */ #define IPSEC_CREATE_DELETE_UNUSED_TUNNELS 0x01 @@ -178,6 +180,11 @@ static int fill_contact( suri = m->dst_uri; LM_DBG("using dst uri for contact filling: %.*s\n", suri.len, suri.s); + } else if((sflags & IPSEC_RURIADDR_SEARCH) && m->new_uri.s!=NULL + && m->new_uri.len>0) { + suri = m->new_uri; + LM_DBG("using new r-uri for contact filling: %.*s\n", + suri.len, suri.s); } else { suri = m->first_line.u.request.uri; LM_DBG("using original uri for contact filling: %.*s\n",

1 0

git:master:39c44dd7: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 30 May '22

30 May '22

Module: kamailio Branch: master Commit: 39c44dd769104c2cc3af6c3a11ec44287134894b URL: https://github.com/kamailio/kamailio/commit/39c44dd769104c2cc3af6c3a11ec442… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-30T15:31:17+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/39c44dd769104c2cc3af6c3a11ec442… Patch: https://github.com/kamailio/kamailio/commit/39c44dd769104c2cc3af6c3a11ec442… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index f9e0d36d27..43c1886ba3 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -301,10 +301,14 @@ ipsec_create("location", "1"); Meaning of the parameters is as follows: * domain - Logical domain within the registrar. If a database is used then this must be name of the table which stores the contacts. - flags - 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. This is an - optional parameter, default value - 0. + flags - 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. + + 0x04 - use destination URI for IPSec tunnel search. Useful for + routing requests within dialog. + This is an optional parameter, default value - 0. Example 1.12. ipsec_forward ...

1 0

git:master:4ce48efb: ims_ipsec_pcscf: simplified parsing target uri for contact filling
by Daniel-Constantin Mierla 30 May '22

30 May '22

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;

1 0

git:master:a851acca: ims_ipsec_pcscf: option to use dst address for tunnel search
by Daniel-Constantin Mierla 30 May '22

30 May '22

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; }

1 0

git:master:c0628e4e: ims_ipsec_pcscf: docs for new flag to use dst uri for ipsec tunnel search
by Daniel-Constantin Mierla 30 May '22

30 May '22

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>

1 0

git:5.6:b0d6a66f: pkg/kamailio/obs: packaged siprepo module into RPM files
by Sergey Safarov 30 May '22

30 May '22

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

1 0

git:master:a812e490: pkg/kamailio/obs: packaged siprepo module into RPM files
by Sergey Safarov 30 May '22

30 May '22

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

1 0

git:master:61b175bc: ims_usrloc_scscf: same type for init flag variable
by Daniel-Constantin Mierla 30 May '22

30 May '22

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;

1 0

git:master:44b46535: ims_usrloc_pcscf: same type for init flag variable
by Daniel-Constantin Mierla 30 May '22

30 May '22

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;

1 0

git:master:3ba676e9: ims_ipsec_pcscf: same type for init flag variable
by Daniel-Constantin Mierla 30 May '22

30 May '22

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; }

1 0

git:master:a4cba5ee: ims_ipsec_pcscf: clang-format for coherent indentation and coding style
by Daniel-Constantin Mierla 30 May '22

30 May '22

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…

1 0

[kamailio/kamailio] mhomed not working for tls destination (Issue #3124)
by Aidar 30 May '22

30 May '22

### 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 2

git:master:ab8cb43c: rx_aar: unreference dialog in case of aar update (#3104)
by GitHub 30 May '22

30 May '22

Module: kamailio Branch: master Commit: ab8cb43c83f8c9528e45a5b57fbb1440360f201e URL: https://github.com/kamailio/kamailio/commit/ab8cb43c83f8c9528e45a5b57fbb144… Author: Atanas Bakalov <atanas.bakalov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2022-05-30T10:46:38+02:00 rx_aar: unreference dialog in case of aar update (#3104) - release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request Co-authored-by: Atanas Bakalov <atanas(a)wgtwo.com> --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/ab8cb43c83f8c9528e45a5b57fbb144… Patch: https://github.com/kamailio/kamailio/commit/ab8cb43c83f8c9528e45a5b57fbb144… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index b60f689e60..afd7ba3e74 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -180,6 +180,8 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + } else { + unref_dlg(data->dlg, 1); } result = CSCF_RETURN_TRUE; } else {

1 0

[kamailio/kamailio] ims_ipsec_pcscf: ik and ck keys expansion fixes (PR #3121)
by riccardv 30 May '22

30 May '22

Input ik,ck keys for add_sa() function are not zero terminated that cause - des3_ede encryption key expansion possible buffer overflow. Also: - sha1 authentication key expansion has been corrected.   #### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3121 -- Commit Summary -- * ims_ipsec_pcscf: ik and ck keys expansion fixes -- File Changes -- M src/modules/ims_ipsec_pcscf/ipsec.c (50) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3121.patch https://github.com/kamailio/kamailio/pull/3121.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3121 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3121(a)github.com>

3 6

git:master:0a494043: ims_ipsec_pcscf: ik and ck keys expansion fixes (#3121)
by GitHub 30 May '22

30 May '22

Module: kamailio Branch: master Commit: 0a494043b70b3c5e47397f03802fe8fa79ed1fb6 URL: https://github.com/kamailio/kamailio/commit/0a494043b70b3c5e47397f03802fe8f… Author: riccardv <70984967+riccardv(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2022-05-30T10:45:26+02:00 ims_ipsec_pcscf: ik and ck keys expansion fixes (#3121) - input ik,ck keys for add_sa() are not zero terminated. - des3_ede encryption key expansion possible buffer overflow, - sha1 authentication key expansion correction. Co-authored-by: riccardv <tafkap(a)gmx.com> --- Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/0a494043b70b3c5e47397f03802fe8f… Patch: https://github.com/kamailio/kamailio/commit/0a494043b70b3c5e47397f03802fe8f… --- diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 309c47a180..76c851818b 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -182,34 +182,57 @@ int add_sa(struct mnl_socket* nl_sock, const struct ip_addr *src_addr_param, con // Set the proper algorithm by r_alg str if(strncasecmp(r_alg.s, "hmac-md5-96", r_alg.len) == 0) { strcpy(l_auth_algo->alg_name,"md5"); - } - else if(strncasecmp(r_alg.s, "hmac-sha-1-96", r_alg.len) == 0) { + l_auth_algo->alg_key_len = ik.len * 4; + string_to_key(l_auth_algo->alg_key, ik); + } else if(strncasecmp(r_alg.s, "hmac-sha-1-96", r_alg.len) == 0) { strcpy(l_auth_algo->alg_name,"sha1"); + str ik1; + ik1.len = ik.len+8; + ik1.s = pkg_malloc (ik1.len+1); + if (ik1.s == NULL) { + LM_ERR("Error allocating memory\n"); + return -1; + } + memcpy (ik1.s,ik.s,ik.len); + ik1.s[ik.len]=0; + strcat (ik1.s,"00000000"); + l_auth_algo->alg_key_len = ik1.len * 4; + string_to_key(l_auth_algo->alg_key, ik1); + pkg_free(ik1.s); } else { - // set default algorithm to sha1 - strcpy(l_auth_algo->alg_name,"sha1"); + LM_DBG("Creating security associations: UNKNOW Auth Algorithm\n"); + return -1; } - l_auth_algo->alg_key_len = ik.len * 4; - string_to_key(l_auth_algo->alg_key, ik); - mnl_attr_put(l_nlh, XFRMA_ALG_AUTH, sizeof(struct xfrm_algo) + l_auth_algo->alg_key_len, l_auth_algo); // add encription algorithm for this SA l_enc_algo = (struct xfrm_algo *)l_enc_algo_buf; + // cipher_null, des, des3_ede, aes if (strncasecmp(r_ealg.s,"aes-cbc",r_ealg.len) == 0) { strcpy(l_enc_algo->alg_name,"aes"); l_enc_algo->alg_key_len = ck.len * 4; string_to_key(l_enc_algo->alg_key, ck); - } - else if (strncasecmp(r_ealg.s,"des-ede3-cbc",r_ealg.len) == 0) { + } else if (strncasecmp(r_ealg.s,"des-ede3-cbc",r_ealg.len) == 0) { strcpy(l_enc_algo->alg_name,"des3_ede"); - l_enc_algo->alg_key_len = ck.len * 4; - string_to_key(l_enc_algo->alg_key, ck); - } else { - // set default algorithm to null + str ck1; + ck1.len = ck.len+ck.len/2; + ck1.s = pkg_malloc (ck1.len+1); + if (ck1.s == NULL) { + LM_ERR("Error allocating memory\n"); + return -1; + } + memcpy (ck1.s,ck.s,ck.len); + memcpy (ck1.s+ck.len,ck.s,ck.len/2); + l_enc_algo->alg_key_len = ck1.len * 4; + string_to_key(l_enc_algo->alg_key, ck1); + pkg_free(ck1.s); + } else if (strncasecmp(r_ealg.s,"null",r_ealg.len) == 0) { strcpy(l_enc_algo->alg_name,"cipher_null"); - l_enc_algo->alg_key_len = 0; + l_enc_algo->alg_key_len = 0; + } else { + LM_DBG("Creating security associations: UNKNOW Enc Algorithm\n"); + return -1; } mnl_attr_put(l_nlh, XFRMA_ALG_CRYPT, sizeof(struct xfrm_algo) + l_enc_algo->alg_key_len, l_enc_algo);

1 0

git:master:9b8a4fd1: lost: URI list support in LoST response (filter for sip/sips scheme)
by Wolfgang Kampichler 28 May '22

28 May '22

Module: kamailio Branch: master Commit: 9b8a4fd17e8819395043f54d43dab07a226d8490 URL: https://github.com/kamailio/kamailio/commit/9b8a4fd17e8819395043f54d43dab07… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2022-05-28T22:42:02+02:00 lost: URI list support in LoST response (filter for sip/sips scheme) --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h --- Diff: https://github.com/kamailio/kamailio/commit/9b8a4fd17e8819395043f54d43dab07… Patch: https://github.com/kamailio/kamailio/commit/9b8a4fd17e8819395043f54d43dab07… --- diff --git a/src/modules/lost/functions.c b/src/modules/lost/functions.c index 711c3732bf..bc6dbd936c 100644 --- a/src/modules/lost/functions.c +++ b/src/modules/lost/functions.c @@ -1,7 +1,7 @@ /* * lost module functions * - * Copyright (C) 2021 Wolfgang Kampichler + * Copyright (C) 2022 Wolfgang Kampichler * DEC112, FREQUENTIS AG * * This file is part of Kamailio, a free SIP server. @@ -1123,16 +1123,24 @@ int lost_function(struct sip_msg *_m, char *_con, char *_uri, char *_name, switch(fsrdata->category) { case RESPONSE: if(fsrdata->uri != NULL) { - /* get the first uri element */ - if((tmp.s = fsrdata->uri->value) != NULL) { - tmp.len = strlen(fsrdata->uri->value); - if(pkg_str_dup(&uri, &tmp) < 0) { - LM_ERR("could not copy: [%.*s]\n", tmp.len, tmp.s); - goto err; - } + /* get the first sips uri element ... */ + if(lost_search_response_list(&fsrdata->uri, &tmp.s, SIPS_S) > 0) { + tmp.len = strlen(tmp.s); + /* or the first sip uri element ... */ + } else if(lost_search_response_list(&fsrdata->uri, &tmp.s, SIP_S) > 0) { + tmp.len = strlen(tmp.s); + /* or return error if nothing found */ + } else { + LM_ERR("sip/sips uri not found: [%.*s]\n", ret.len, ret.s); + goto err; + } + /* copy uri string */ + if(pkg_str_dup(&uri, &tmp) < 0) { + LM_ERR("could not copy: [%.*s]\n", tmp.len, tmp.s); + goto err; } } else { - LM_ERR("uri not found: [%.*s]\n", ret.len, ret.s); + LM_ERR("uri element not found: [%.*s]\n", ret.len, ret.s); goto err; } if(fsrdata->mapping != NULL) { diff --git a/src/modules/lost/response.c b/src/modules/lost/response.c index cc6d65ad2a..dcd6dc5363 100644 --- a/src/modules/lost/response.c +++ b/src/modules/lost/response.c @@ -1,7 +1,7 @@ /* * lost module LoST response parsing functions * - * Copyright (C) 2021 Wolfgang Kampichler + * Copyright (C) 2022 Wolfgang Kampichler * DEC112, FREQUENTIS AG * * This file is part of Kamailio, a free SIP server. @@ -353,6 +353,40 @@ void lost_reverse_response_list(p_lost_list_t *head) *head = prev; } +/* + * lost_search_response_list(list, value, search) + * looks for search string in list object and returns pointer if found + */ +int lost_search_response_list(p_lost_list_t *list, char **val, const char *str) +{ + p_lost_list_t cur; + p_lost_list_t next; + + if(*list == NULL) + return 0; + + if(str == NULL) + return 0; + + LM_DBG("### list data search [%s]\n", str); + + next = *list; + while((cur = next) != NULL) { + next = cur->next; + if(cur->value != NULL) { + if(strncasecmp(cur->value, str, strlen(str)) == 0) { + *val = cur->value; + + LM_DBG("###\t[%s] found\n", cur->value); + + return 1; + } + } + } + + return 0; +} + /* * lost_delete_response_list(list) * removes response list from private memory diff --git a/src/modules/lost/response.h b/src/modules/lost/response.h index 991f82ac6e..9c1fcbcb23 100644 --- a/src/modules/lost/response.h +++ b/src/modules/lost/response.h @@ -1,7 +1,7 @@ /* * lost module LoST response parsing functions * - * Copyright (C) 2021 Wolfgang Kampichler + * Copyright (C) 2022 Wolfgang Kampichler * DEC112, FREQUENTIS AG * * This file is part of Kamailio, a free SIP server. @@ -56,6 +56,9 @@ #define ERRORS_NODE (const char *)"errors" +#define SIP_S (const char *)"sip:" +#define SIPS_S (const char *)"sips:" + #define HELD_RESPONSE_REFERENCE 1 #define HELD_RESPONSE_VALUE 2 @@ -133,4 +136,7 @@ int is_cid_laquot(char *); int is_http_laquot(char *); int is_https_laquot(char *); +/* list search */ +int lost_search_response_list(p_lost_list_t *, char **, const char *); + #endif

1 0

git:master:de70fdc5: dialog: dlg_get_var assure return null on error
by Victor Seva 27 May '22

27 May '22

Module: kamailio Branch: master Commit: de70fdc58a011bb8189f83bad99e064a8a0111da URL: https://github.com/kamailio/kamailio/commit/de70fdc58a011bb8189f83bad99e064… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-27T16:58:28+02:00 dialog: dlg_get_var assure return null on error --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/de70fdc58a011bb8189f83bad99e064… Patch: https://github.com/kamailio/kamailio/commit/de70fdc58a011bb8189f83bad99e064… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 6668712dc3..767e6efa54 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1570,53 +1570,62 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char str k = STR_NULL; str *val = NULL; pv_value_t dst_val; - pv_spec_t* dst_pv; + pv_spec_t* dst_pv = (pv_spec_t *)pv; if(ci==0 || ft==0 || tt==0) { LM_ERR("invalid parameters\n"); - return -1; + goto error; } if(fixup_get_svalue(msg, (gparam_p)ci, &sc)!=0) { LM_ERR("unable to get Call-ID\n"); - return -1; + goto error; } if(fixup_get_svalue(msg, (gparam_p)ft, &sf)!=0) { LM_ERR("unable to get From tag\n"); - return -1; + goto error; } if(fixup_get_svalue(msg, (gparam_p)tt, &st)!=0) { LM_ERR("unable to get To Tag\n"); - return -1; + goto error; } if(st.s==NULL || st.len == 0) { LM_ERR("invalid To tag parameter\n"); - return -1; + goto error; } if(fixup_get_svalue(msg, (gparam_p)key, &k)!=0) { LM_ERR("unable to get key name\n"); - return -1; + goto error; } - dst_pv = (pv_spec_t *)pv; - val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); + val = ki_dlg_get_var(msg, &sc, &sf, &st, &k); if(val) { memset(&dst_val, 0, sizeof(pv_value_t)); dst_val.flags |= PV_VAL_STR; dst_val.rs.s = val->s; dst_val.rs.len = val->len; - if(pv_set_spec_value(msg, dst_pv, 0, &dst_val) != 0) return -1; } else { - if(pv_get_null(msg, NULL, &dst_val) != 0) return -1; + pv_get_null(msg, NULL, &dst_val); + } + if(pv_set_spec_value(msg, dst_pv, 0, &dst_val) != 0) { + LM_ERR("unable to set value to dst_pv\n"); + if(val) goto error; else return -1; } return 1; + +error: + pv_get_null(msg, NULL, &dst_val); + if(pv_set_spec_value(msg, dst_pv, 0, &dst_val) != 0) { + LM_ERR("unable to set null value to dst_pv\n"); + } + return -1; } static int fixup_dlg_get_var(void** param, int param_no)

1 0

git:master:a0d89214: dialog: w_dlg_get_var, fix incompatible pointer
by Victor Seva 27 May '22

27 May '22

Module: kamailio Branch: master Commit: a0d89214cf8296d30bacdf10a8732bc8826b2418 URL: https://github.com/kamailio/kamailio/commit/a0d89214cf8296d30bacdf10a8732bc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-27T17:18:01+02:00 dialog: w_dlg_get_var, fix incompatible pointer > CC (gcc) [M dialog.so] dialog.o > dialog.c: In function 'w_dlg_get_var': dialog.c:1608:6: warning: assignment to 'str *' {aka 'struct _str *'} from incompatible pointer type 'sr_kemi_xval_t *' {aka 'struct sr_kemi_xval *'} [-Wincompatible-pointer-types] > 1608 | val = ki_dlg_get_var(msg, &sc, &sf, &st, &k); > | ^ --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/a0d89214cf8296d30bacdf10a8732bc… Patch: https://github.com/kamailio/kamailio/commit/a0d89214cf8296d30bacdf10a8732bc… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 767e6efa54..2082a41e19 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1568,7 +1568,7 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char str sf = STR_NULL; str st = STR_NULL; str k = STR_NULL; - str *val = NULL; + sr_kemi_xval_t *val = NULL; pv_value_t dst_val; pv_spec_t* dst_pv = (pv_spec_t *)pv; @@ -1606,11 +1606,11 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char goto error; } val = ki_dlg_get_var(msg, &sc, &sf, &st, &k); - if(val) { + if(val && val->vtype == SR_KEMIP_STR) { memset(&dst_val, 0, sizeof(pv_value_t)); dst_val.flags |= PV_VAL_STR; - dst_val.rs.s = val->s; - dst_val.rs.len = val->len; + dst_val.rs.s = val->v.s.s; + dst_val.rs.len = val->v.s.len; } else { pv_get_null(msg, NULL, &dst_val); }

1 0

git:master:0d9380c8: modules: readme files regenerated - auth_identity ... [skip ci]
by Kamailio Dev 24 May '22

24 May '22

Module: kamailio Branch: master Commit: 0d9380c8812d4e57b0c92f5f68b6c20001b28819 URL: https://github.com/kamailio/kamailio/commit/0d9380c8812d4e57b0c92f5f68b6c20… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-24T12:31:17+02:00 modules: readme files regenerated - auth_identity ... [skip ci] --- Modified: src/modules/auth_identity/README --- Diff: https://github.com/kamailio/kamailio/commit/0d9380c8812d4e57b0c92f5f68b6c20… Patch: https://github.com/kamailio/kamailio/commit/0d9380c8812d4e57b0c92f5f68b6c20… --- diff --git a/src/modules/auth_identity/README b/src/modules/auth_identity/README index 5ffdd5d9b1..acbac172dd 100644 --- a/src/modules/auth_identity/README +++ b/src/modules/auth_identity/README @@ -25,7 +25,7 @@ Gergely Kovacs 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 6. Functions @@ -91,7 +91,7 @@ Chapter 1. Admin Guide 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 6. Functions @@ -174,7 +174,7 @@ Chapter 1. Admin Guide 5.6. callid_cache_limit (integer) 5.7. certificate_cache_limit (integer) 5.8. cainfo_path (string) - 5.9. accept_pem_certs ([0|1]) + 5.9. accept_pem_certs (int) 5.1. privatekey_path (string) @@ -296,11 +296,12 @@ modparam("auth_identity","certificate_cache_limit",4096) modparam("auth_identity","cainfo_path","/etc/ssl/certs/ca-certificates.crt") ... -5.9. accept_pem_certs ([0|1]) +5.9. accept_pem_certs (int) Note: this parameter is for verifier service. Enables the acquired certificate processing if it is in PEM format. + Value can be 0 or 1. This parameter is optional. The default value is "0".

1 0

git:master:9155a53b: auth_identity: removed auth_identity.xml from source folder
by Daniel-Constantin Mierla 24 May '22

24 May '22

Module: kamailio Branch: master Commit: 9155a53bccd090e51b274802d140f363aca6d4b7 URL: https://github.com/kamailio/kamailio/commit/9155a53bccd090e51b274802d140f36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-24T12:19:38+02:00 auth_identity: removed auth_identity.xml from source folder - there is one in doc/ subfolder --- Removed: src/modules/auth_identity/auth_identity.xml --- Diff: https://github.com/kamailio/kamailio/commit/9155a53bccd090e51b274802d140f36… Patch: https://github.com/kamailio/kamailio/commit/9155a53bccd090e51b274802d140f36…

1 0

git:master:6e7b6cfa: auth_identity: docs - type for accept_pem_certs param
by Daniel-Constantin Mierla 24 May '22

24 May '22

Module: kamailio Branch: master Commit: 6e7b6cfabba6774627f942d7f02e1adf62bf7797 URL: https://github.com/kamailio/kamailio/commit/6e7b6cfabba6774627f942d7f02e1ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-24T12:21:53+02:00 auth_identity: docs - type for accept_pem_certs param --- Modified: src/modules/auth_identity/doc/auth_identity_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/6e7b6cfabba6774627f942d7f02e1ad… Patch: https://github.com/kamailio/kamailio/commit/6e7b6cfabba6774627f942d7f02e1ad… --- diff --git a/src/modules/auth_identity/doc/auth_identity_params.xml b/src/modules/auth_identity/doc/auth_identity_params.xml index a252bbed6b..aefb49cdd0 100644 --- a/src/modules/auth_identity/doc/auth_identity_params.xml +++ b/src/modules/auth_identity/doc/auth_identity_params.xml @@ -190,11 +190,11 @@ modparam("auth_identity","cainfo_path","/etc/ssl/certs/ca-certificates.crt") </section> <section id="accept_pem_certs"> - <title><varname>accept_pem_certs</varname> ([0|1])</title> + <title><varname>accept_pem_certs</varname> (int)</title> <para>Note: this parameter is for verifier service.</para> <para> Enables the acquired certificate processing if it is in PEM - format. + format. Value can be 0 or 1. </para> <para> This parameter is optional. The default value is "0".

1 0

git:master:d001dc00: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 24 May '22

24 May '22

Module: kamailio Branch: master Commit: d001dc00e4f5cc5925727757e3517eebc164c7f8 URL: https://github.com/kamailio/kamailio/commit/d001dc00e4f5cc5925727757e3517ee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-24T10:46:28+02:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/d001dc00e4f5cc5925727757e3517ee… Patch: https://github.com/kamailio/kamailio/commit/d001dc00e4f5cc5925727757e3517ee…

1 0

[kamailio/kamailio] IMS, P-CSCF: fix issues with UEs and ipsec tunnel (PR #3094)
by Kristiyan Peychev 24 May '22

24 May '22

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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  Implement reuse of IPSec tunnels when UEs are re-registering or de-registering, optimizing tunnel creations and key exchanges, and (hopefully) performance. This is a refactored version of PR #3029. I hope that all the issues @alexyosifov found have been fixed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3094 -- Commit Summary -- * ims_ipsec_pcscf: fix issues with UEs and ipsec tunnel -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (151) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (12) M src/modules/ims_ipsec_pcscf/ipsec.c (29) D src/modules/ims_ipsec_pcscf/port_gen.c (227) D src/modules/ims_ipsec_pcscf/port_gen.h (41) M src/modules/ims_ipsec_pcscf/sec_agree.c (33) M src/modules/ims_ipsec_pcscf/spi_gen.c (112) M src/modules/ims_ipsec_pcscf/spi_gen.h (6) M src/modules/ims_ipsec_pcscf/spi_list.c (62) M src/modules/ims_ipsec_pcscf/spi_list.h (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3094.patch https://github.com/kamailio/kamailio/pull/3094.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3094 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3094(a)github.com>

3 6

git:master:59fd5cd7: IMS, P-CSCF: fix issues with UEs and ipsec tunnel (#3094)
by GitHub 24 May '22

24 May '22

Module: kamailio Branch: master Commit: 59fd5cd7053df2941aa6df7270ed7a021ce1f62d URL: https://github.com/kamailio/kamailio/commit/59fd5cd7053df2941aa6df7270ed7a0… Author: Kristiyan Peychev <97663519+kristiyan-peychev-flolive(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2022-05-24T10:39:47+02:00 IMS, P-CSCF: fix issues with UEs and ipsec tunnel (#3094) * ims_ipsec_pcscf: fix issues with UEs and ipsec tunnel UEs were not sending certain replies through the ipsec tunnel * ims_ipsec_pcscf: fix issues pointed out in code review Remove error logs which were not errors at all. Fix issue in clean_spi_list where the free SPI list would get completely wiped. * ims_ipsec_pcscf: lower log severity from error to info Co-authored-by: Teodor Mihov <teodor.mihov(a)flolive.net> --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml 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/sec_agree.c 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 Removed: src/modules/ims_ipsec_pcscf/port_gen.c Removed: src/modules/ims_ipsec_pcscf/port_gen.h --- Diff: https://github.com/kamailio/kamailio/commit/59fd5cd7053df2941aa6df7270ed7a0… Patch: https://github.com/kamailio/kamailio/commit/59fd5cd7053df2941aa6df7270ed7a0…

1 0

Kamailio v5.6.0 Released - new major version is out
by Daniel-Constantin Mierla 23 May '22

23 May '22

Kamailio v5.6.0 is out – it comes with 7 new modules and a considerable set of improvements touching again more than 90 existing modules. You can read detailed release notes at: * https://www.kamailio.org/w/kamailio-v5-6-0-release-notes/ Many thanks to all developers and community members that made possible this release. v5.6.0 brings more flexibility and optimizations across many components, plenty of new variables and transformations, load balancer enhancements, generic iterators for SIP headers and body lines, alternative http client, NATS PubSub connector, improvements to STIR/SHAKEN, IMS/VoLTE, rtpengine and tls as well as more functions exported to KEMI interface ... just to list only a few here. Enjoy Kamailio v5.5.0! Thank you for flying Kamailio! Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online: June 20-23, 2022 * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:5.6:61e86a1f: ChangeLog: content updated for v5.6.0
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 61e86a1f502388ffd4dce6e52811ba640337c813 URL: https://github.com/kamailio/kamailio/commit/61e86a1f502388ffd4dce6e52811ba6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T12:04:09+02:00 ChangeLog: content updated for v5.6.0 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/61e86a1f502388ffd4dce6e52811ba6… Patch: https://github.com/kamailio/kamailio/commit/61e86a1f502388ffd4dce6e52811ba6… --- diff --git a/ChangeLog b/ChangeLog index 62a187ce15..523193a5dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,37 @@ ===================== Changes Since Version 5.5.0 =========================== +commit 9df3ebedc62631ecb5faf1bc93008c30d1ffecb7 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon May 23 10:57:55 2022 +0200 + + pkg: version set to 5.6.0 for rpms and alpine specs + +commit dd2978576fca0985fe05cf6b26a9330d1b8cba1c +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon May 23 10:09:18 2022 +0200 + + Makefile.defs: version set to 5.6.0 + +commit 9b044b41778b3d3d55027751fc6c2b55027cc3c4 +Author: Daniel-Constantin Mierla <miconda(a)gmail.com> +Date: Mon May 23 09:44:43 2022 +0200 + + ChangeLog: initial content for v5.6.x series + +commit c38529cad713964534ef1ad94c31ce88c3e16c81 +Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> +Date: Mon May 23 09:29:20 2022 +0200 + + pkg/kamailio/deb: version set 5.6.0 + +commit 018f6145e441dede75ea6f128b472397574f7763 +Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> +Date: Mon May 16 15:08:38 2022 +0200 + + pkg/kamailio/deb: version set 5.6.0~rc1 + + commit 88786b402cbeb4a7d2261ed198c0927cec79e362 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 23 08:18:04 2022 +0200

1 0

git:5.6:9df3ebed: pkg: version set to 5.6.0 for rpms and alpine specs
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 9df3ebedc62631ecb5faf1bc93008c30d1ffecb7 URL: https://github.com/kamailio/kamailio/commit/9df3ebedc62631ecb5faf1bc93008c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T10:57:55+02:00 pkg: version set to 5.6.0 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9df3ebedc62631ecb5faf1bc93008c3… Patch: https://github.com/kamailio/kamailio/commit/9df3ebedc62631ecb5faf1bc93008c3… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 6bf221630da..ff4836a3d73 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.0 +pkgver=5.6.0 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5b87a501bcd..10ada842b53 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.0 +%define ver 5.6.0 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.6:dd297857: Makefile.defs: version set to 5.6.0
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: dd2978576fca0985fe05cf6b26a9330d1b8cba1c URL: https://github.com/kamailio/kamailio/commit/dd2978576fca0985fe05cf6b26a9330… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T10:09:18+02:00 Makefile.defs: version set to 5.6.0 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/dd2978576fca0985fe05cf6b26a9330… Patch: https://github.com/kamailio/kamailio/commit/dd2978576fca0985fe05cf6b26a9330… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 171fba98f6..d8887dc0ca 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:5.6:9b044b41: ChangeLog: initial content for v5.6.x series
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 9b044b41778b3d3d55027751fc6c2b55027cc3c4 URL: https://github.com/kamailio/kamailio/commit/9b044b41778b3d3d55027751fc6c2b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T09:45:14+02:00 ChangeLog: initial content for v5.6.x series --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/9b044b41778b3d3d55027751fc6c2b5… Patch: https://github.com/kamailio/kamailio/commit/9b044b41778b3d3d55027751fc6c2b5…

1 0

git:5.6:c38529ca: pkg/kamailio/deb: version set 5.6.0
by Victor Seva 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: c38529cad713964534ef1ad94c31ce88c3e16c81 URL: https://github.com/kamailio/kamailio/commit/c38529cad713964534ef1ad94c31ce8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-23T09:29:20+02:00 pkg/kamailio/deb: version set 5.6.0 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/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/c38529cad713964534ef1ad94c31ce8… Patch: https://github.com/kamailio/kamailio/commit/c38529cad713964534ef1ad94c31ce8…

1 0

git:5.6:018f6145: pkg/kamailio/deb: version set 5.6.0~rc1
by Victor Seva 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 018f6145e441dede75ea6f128b472397574f7763 URL: https://github.com/kamailio/kamailio/commit/018f6145e441dede75ea6f128b47239… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-23T09:03:50+02:00 pkg/kamailio/deb: version set 5.6.0~rc1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/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/018f6145e441dede75ea6f128b47239… Patch: https://github.com/kamailio/kamailio/commit/018f6145e441dede75ea6f128b47239…

1 0

Releasing Kamailio v5.6.0
by Daniel-Constantin Mierla 23 May '22

23 May '22

Hello, with some effort directed lately to convert the wiki content to markdown files and host them on github, it's time to now to nail down the path to release nest major release for Kamailio, respectively v5.6.0. What's new in this major release as well as upgrade guidelines have to be built, but I hope to be done in time to release Kamailio v5.6.0 either on Monday, June 23, 2022 or on Wednesday, June 25, 2022. Should anyone consider a different release planning, let's discuss it. If anyone wants to help with them, the content has to be added to the github wiki repository: * https://github.com/kamailio/kamailio-wiki If not there, new files have to be created and linked from the main page. The wiki is built with mkdocs into html and made available for browsing at: * https://kamailio.org/wikidocs/ Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online: June 20-23, 2022 * https://www.asipto.com/sw/kamailio-advanced-training-online/

2 3

git:5.6:88786b40: INSTALL, README: updated version and links
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 88786b402cbeb4a7d2261ed198c0927cec79e362 URL: https://github.com/kamailio/kamailio/commit/88786b402cbeb4a7d2261ed198c0927… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:19:00+02:00 INSTALL, README: updated version and links (cherry picked from commit 8718fb447b0d5d53a0eeb5b21ed6f8d1766cb21b) --- Modified: INSTALL Modified: README Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/88786b402cbeb4a7d2261ed198c0927… Patch: https://github.com/kamailio/kamailio/commit/88786b402cbeb4a7d2261ed198c0927… --- diff --git a/INSTALL b/INSTALL index 7982d1d380..4f7f87a408 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ Kamailio SIP Server Installation Notes - http://www.kamailio.org + https://www.kamailio.org ================================================== @@ -16,7 +16,7 @@ You can find a similar tutorial and many more on project's web site: - https://www.kamailio.org/w/documentation/ - - https://www.kamailio.org/wiki/ + - https://www.kamailio.org/wikidocs/ Table of Contents diff --git a/README b/README index 957361df15..6d22d5d941 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -Kamailio v5.5 +Kamailio v5.6 ============= https://www.kamailio.org @@ -67,7 +67,7 @@ III. Getting started The documentation wiki is an important source of tutorials for installing and understanding how Kamailio works: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ The INSTALL document provides more details and guidelines that will help with the installation. @@ -93,7 +93,7 @@ both developer teams. During the development of the release 4.0, autumn-winter of 2012, the merger of the products was completed and a unified product was released. -See http://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. +See https://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. V. Obtaining Help ================= @@ -126,7 +126,7 @@ For code contributions, follow the suggestions provided at: The recommended way to contribute code is via pull requests to Kamailio project on Github: - * httpss://github.com/kamailio + * https://github.com/kamailio VII. More Information ===================== diff --git a/README.md b/README.md index c20510bdfd..f32245dda2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Project Website: - * http://www.kamailio.org + * https://www.kamailio.org [20 Years Of Kamailio Development: Sep 3, 2001 - Sep 3, 2021](https://www.kamailio.org/w/2021/09/kamailio-20-years-of-development/) @@ -57,7 +57,7 @@ The online documentation for modules in the latest stable branch: The wiki collects a consistent number of tutorials, the indexes for variables, functions and parameters: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ Please read the README file in the source code, one per module. @@ -65,14 +65,14 @@ Please read the README file in the source code, one per module. Step by step tutorials to install Kamailio from source code are available at: - * https://www.kamailio.org/wiki/start#installation + * https://www.kamailio.org/wikidocs/#installation Please read the INSTALL file from the source code for more information. Repositories for Linux packages: - * deb: https://www.kamailio.org/wiki/packages/debs - * rpm: https://www.kamailio.org/wiki/packages/rpms + * deb: https://www.kamailio.org/wikidocs/packages/debs + * rpm: https://www.kamailio.org/wikidocs/packages/rpms ## Issues And Bug Reports

1 0

git:5.6:9b8f927f: tm: fix kemi t_relay_to_proto() variants for tls
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 9b8f927f613f1666af19347b928a099a208a8d71 URL: https://github.com/kamailio/kamailio/commit/9b8f927f613f1666af19347b928a099… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:07:03+02:00 tm: fix kemi t_relay_to_proto() variants for tls (cherry picked from commit 1f7e894f5b293f97dc99e1b7e5d06159f91a96f7) --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/9b8f927f613f1666af19347b928a099… Patch: https://github.com/kamailio/kamailio/commit/9b8f927f613f1666af19347b928a099… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 69defa1f26..b6fcc96681 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2930,7 +2930,7 @@ static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) proto = PROTO_UDP; } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { proto = PROTO_TCP; - } else if (strncasecmp(sproto->s, "TLS", 3)) { + } else if (strncasecmp(sproto->s, "TLS", 3) == 0) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s); @@ -2955,7 +2955,7 @@ static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, int proto = PROTO_UDP; } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { proto = PROTO_TCP; - } else if (strncasecmp(sproto->s, "TLS", 3)) { + } else if (strncasecmp(sproto->s, "TLS", 3) == 0) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s);

1 0

git:5.6:76acfb71: core: mod fixup helpers for params sequence str, str, int
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: 5.6 Commit: 76acfb717fac8fa8a960c0e830998d9db9909ccf URL: https://github.com/kamailio/kamailio/commit/76acfb717fac8fa8a960c0e830998d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:07:55+02:00 core: mod fixup helpers for params sequence str, str, int (cherry picked from commit 5e4576a54e7783b1ee8fde6af7919232a5e207c4) --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/76acfb717fac8fa8a960c0e830998d9… Patch: https://github.com/kamailio/kamailio/commit/76acfb717fac8fa8a960c0e830998d9… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 325e3d117b..925048d940 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -801,6 +801,38 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen) return -1; } +/** + * + */ +int fixup_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_spve_null(param, 1); + case 3: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_free_spve_null(param, 1); + case 3: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index ca63a5a804..8c2c766c1e 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -163,6 +163,9 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); int fixup_igp_regexp(void** param, int param_no); int fixup_free_igp_regexp(void** param, int param_no); +int fixup_ssi(void** param, int param_no); +int fixup_free_ssi(void** param, int param_no); + int fixup_sssi(void** param, int param_no); int fixup_free_sssi(void** param, int param_no);

1 0

git:master:8718fb44: INSTALL, README: updated version and links
by Daniel-Constantin Mierla 23 May '22

23 May '22

Module: kamailio Branch: master Commit: 8718fb447b0d5d53a0eeb5b21ed6f8d1766cb21b URL: https://github.com/kamailio/kamailio/commit/8718fb447b0d5d53a0eeb5b21ed6f8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:18:04+02:00 INSTALL, README: updated version and links --- Modified: INSTALL Modified: README Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/8718fb447b0d5d53a0eeb5b21ed6f8d… Patch: https://github.com/kamailio/kamailio/commit/8718fb447b0d5d53a0eeb5b21ed6f8d… --- diff --git a/INSTALL b/INSTALL index 7982d1d380..4f7f87a408 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ Kamailio SIP Server Installation Notes - http://www.kamailio.org + https://www.kamailio.org ================================================== @@ -16,7 +16,7 @@ You can find a similar tutorial and many more on project's web site: - https://www.kamailio.org/w/documentation/ - - https://www.kamailio.org/wiki/ + - https://www.kamailio.org/wikidocs/ Table of Contents diff --git a/README b/README index 957361df15..6d22d5d941 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -Kamailio v5.5 +Kamailio v5.6 ============= https://www.kamailio.org @@ -67,7 +67,7 @@ III. Getting started The documentation wiki is an important source of tutorials for installing and understanding how Kamailio works: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ The INSTALL document provides more details and guidelines that will help with the installation. @@ -93,7 +93,7 @@ both developer teams. During the development of the release 4.0, autumn-winter of 2012, the merger of the products was completed and a unified product was released. -See http://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. +See https://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. V. Obtaining Help ================= @@ -126,7 +126,7 @@ For code contributions, follow the suggestions provided at: The recommended way to contribute code is via pull requests to Kamailio project on Github: - * httpss://github.com/kamailio + * https://github.com/kamailio VII. More Information ===================== diff --git a/README.md b/README.md index c20510bdfd..f32245dda2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Project Website: - * http://www.kamailio.org + * https://www.kamailio.org [20 Years Of Kamailio Development: Sep 3, 2001 - Sep 3, 2021](https://www.kamailio.org/w/2021/09/kamailio-20-years-of-development/) @@ -57,7 +57,7 @@ The online documentation for modules in the latest stable branch: The wiki collects a consistent number of tutorials, the indexes for variables, functions and parameters: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ Please read the README file in the source code, one per module. @@ -65,14 +65,14 @@ Please read the README file in the source code, one per module. Step by step tutorials to install Kamailio from source code are available at: - * https://www.kamailio.org/wiki/start#installation + * https://www.kamailio.org/wikidocs/#installation Please read the INSTALL file from the source code for more information. Repositories for Linux packages: - * deb: https://www.kamailio.org/wiki/packages/debs - * rpm: https://www.kamailio.org/wiki/packages/rpms + * deb: https://www.kamailio.org/wikidocs/packages/debs + * rpm: https://www.kamailio.org/wikidocs/packages/rpms ## Issues And Bug Reports

1 0

[kamailio/kamailio] [kamailio 5.6.0~rc1] Possible regression for {s.int} (Issue #3116)
by George Diamantopoulos 22 May '22

22 May '22

### Description I noticed at least one regression while testing out kamailio 5.6.0: the same configuration yields a different result after upgrading from 5.5.4. More specifically, this xlog line/statement: ``` xlog("L_CRIT", "vn is $vn(cli_164_src_noccgr), to int is $(vn(cli_164_src_noccgr){s.int})\n"); ``` Prints the following in syslog for `$vn(cli_164_src_noccgr) = "2152157200"`: * On 5.5.4: `vn is 2152157200, to int is 2152157200` * On 5.6.0~rc1: `vn is 2152157200, to int is` I've only tested this with a couple of values and it doesn't always happen, for example for `$vn(cli_164_src_noccgr) = "2103260000"` the issue doesn't manifest. Only thing I could think of is 2103260000 can be represented (unsigned) by 31 bits, whereas you need 32 bits for 2152157200? I skimmed over pv_trans.c and there weren't any obvious commits that could take the blame, at least not to me. Perhaps this is a compiler/glibc thing? ### Troubleshooting #### Reproduction Try the transformation above with various values for the pseudovariable being transformed, I guess.  ### Additional Information ``` version: kamailio 5.6.0-rc1 (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 10.2.1 ``` * **Operating System**: ``` Linux sbcprov0-stage-lhe0-cn1 5.10.0-10-amd64 #1 SMP Debian 5.10.84-1 (2021-12-08) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3116 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3116(a)github.com>

3 7

git:master:bed6bba7: dialog: fix ki_dlg_get_var() introduced previously
by Daniel-Constantin Mierla 21 May '22

21 May '22

Module: kamailio Branch: master Commit: bed6bba77a16ec1a840544d674d03d692869c68e URL: https://github.com/kamailio/kamailio/commit/bed6bba77a16ec1a840544d674d03d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-21T08:23:37+02:00 dialog: fix ki_dlg_get_var() introduced previously --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/bed6bba77a16ec1a840544d674d03d6… Patch: https://github.com/kamailio/kamailio/commit/bed6bba77a16ec1a840544d674d03d6… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 5347c0fa1d..6668712dc3 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1549,14 +1549,14 @@ static sr_kemi_xval_t *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, memset(&_sr_kemi_dialog_xval, 0, sizeof(sr_kemi_xval_t)); - val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); + val = ki_dlg_get_var_helper(msg, sc, sf, st, key); if(!val) { sr_kemi_xval_null(&_sr_kemi_dialog_xval, SR_KEMI_XVAL_NULL_NONE); return &_sr_kemi_dialog_xval; } _sr_kemi_dialog_xval.vtype = SR_KEMIP_STR; - _sr_kemi_dialog_xval.v.s = *pval; + _sr_kemi_dialog_xval.v.s = *val; return &_sr_kemi_dialog_xval;

1 0

[kamailio/kamailio] core: const correctness (PR #3120)
by liviu-rolo 20 May '22

20 May '22

benign const qualifiers in inline functions   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3120 -- Commit Summary -- * core: const correctness -- File Changes -- M src/core/ip_addr.h (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3120.patch https://github.com/kamailio/kamailio/pull/3120.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3120 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3120(a)github.com>

4 8

Re: [sr-dev] [kamailio/kamailio] Run failed: build - master (130ce1b)
by Henning Westerholt 20 May '22

20 May '22

Hello, this seems to be caused from 7c347e244cf761d0: dialog.c: In function ‘ki_dlg_get_var’: dialog.c:1552:51: error: ‘k’ undeclared (first use in this function) 1552 | val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); | ^ dialog.c:1552:51: note: each undeclared identifier is reported only once for each function it appears in dialog.c:1552:35: warning: passing argument 2 of ‘ki_dlg_get_var_helper’ from incompatible pointer type [-Wincompatible-pointer-types] 1552 | val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); | ^~~ [..] make[2]: *** [../../Makefile.rules:100: dialog.o] Error 1 Cheers, Henning From: Henning Westerholt <notifications(a)github.com> Sent: Friday, May 20, 2022 6:42 PM To: Kamailio Devel List <sr-dev(a)lists.sip-router.org> Cc: Ci activity <ci_activity(a)noreply.github.com> Subject: [kamailio/kamailio] Run failed: build - master (130ce1b) [GitHub] [kamailio/kamailio] build workflow run [https://github.githubassets.com/images/email/icons/actions.png] build: Some jobs were not successful View workflow run<https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (bullseye, gcc)] build / build (bullseye, gcc) Failed in 2 minutes and 29 seconds [annotations for build / build (bullseye, gcc)]11 <https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (bullseye, clang)] build / build (bullseye, clang) Cancelled [annotations for build / build (bullseye, clang)]2 <https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (sid, gcc)] build / build (sid, gcc) Failed in 2 minutes and 35 seconds [annotations for build / build (sid, gcc)]13 <https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (sid, clang)] build / build (sid, clang) Cancelled [annotations for build / build (sid, clang)]2 <https://github.com/kamailio/kamailio/actions/runs/2359532599> — You are receiving this because this workflow ran on your branch. Manage your GitHub Actions notifications<https://github.com/settings/notifications> GitHub, Inc. ・88 Colin P Kelly Jr Street ・San Francisco, CA 94107

1 0

git:master:130ce1bf: core: const correctness
by Henning Westerholt 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 130ce1bf871cfb4a89bcf0cc74d898f84eeaa981 URL: https://github.com/kamailio/kamailio/commit/130ce1bf871cfb4a89bcf0cc74d898f… Author: Liviu Andron <liviu.andron(a)bjtmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-20T18:38:54+02:00 core: const correctness benign const qualifiers in inline functions --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/130ce1bf871cfb4a89bcf0cc74d898f… Patch: https://github.com/kamailio/kamailio/commit/130ce1bf871cfb4a89bcf0cc74d898f… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 2f7770f81d..88c0e0205e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -301,7 +301,7 @@ int is_mcast(struct ip_addr* ip); /* returns 1 if the given ip address is INADDR_ANY or IN6ADDR_ANY, * 0 otherwise */ -inline static int ip_addr_any(struct ip_addr* ip) +inline static int ip_addr_any(const struct ip_addr* ip) { int r; int l; @@ -316,7 +316,7 @@ inline static int ip_addr_any(struct ip_addr* ip) /* returns 1 if the given ip address is a loopback address * 0 otherwise */ -inline static int ip_addr_loopback(struct ip_addr* ip) +inline static int ip_addr_loopback(const struct ip_addr* ip) { if (ip->af==AF_INET) return ip->u.addr32[0]==htonl(INADDR_LOOPBACK); @@ -352,7 +352,7 @@ inline static void ip_addr_mk_any(int af, struct ip_addr* ip) /* returns 1 if ip & net.mask == net.ip ; 0 otherwise & -1 on error * [ diff. address families ]) */ -inline static int matchnet(struct ip_addr* ip, struct net* net) +inline static int matchnet(const struct ip_addr* ip, const struct net* net) { unsigned int r; @@ -371,7 +371,7 @@ inline static int matchnet(struct ip_addr* ip, struct net* net) /* inits an ip_addr pointer from a sockaddr structure*/ -static inline void sockaddr2ip_addr(struct ip_addr* ip, struct sockaddr* sa) +static inline void sockaddr2ip_addr(struct ip_addr* ip, const struct sockaddr* sa) { switch(sa->sa_family){ case AF_INET: @@ -447,7 +447,7 @@ static inline void su_setport(union sockaddr_union* su, unsigned short port) /* inits an ip_addr pointer from a sockaddr_union ip address */ -static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su) +static inline void su2ip_addr(struct ip_addr* ip, const union sockaddr_union* su) { switch(su->s.sa_family){ case AF_INET: @@ -595,7 +595,7 @@ struct hostent* ip_addr2he(str* name, struct ip_addr* ip); /* init a dest_info structure from a recv_info structure */ inline static void init_dst_from_rcv(struct dest_info* dst, - struct receive_info* rcv) + const struct receive_info* rcv) { dst->send_sock=rcv->bind_address; dst->to=rcv->src_su;

1 0

git:master:7c347e24: dialog: reworked kemi export for dlg_get_var()
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 7c347e244cf761d04d5aff906e88571cd68217f3 URL: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T16:07:56+02:00 dialog: reworked kemi export for dlg_get_var() - return SR_KEMIP_XVAL type --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… Patch: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index b169dc2d26..5347c0fa1d 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1511,7 +1511,7 @@ static int fixup_dlg_bridge(void** param, int param_no) return 0; } -static str *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) +static str *ki_dlg_get_var_helper(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) { dlg_cell_t *dlg = NULL; unsigned int dir = 0; @@ -1538,6 +1538,30 @@ static str *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) return val; } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_dialog_xval = {0}; + +static sr_kemi_xval_t *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) +{ + str *val = NULL; + + memset(&_sr_kemi_dialog_xval, 0, sizeof(sr_kemi_xval_t)); + + val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); + if(!val) { + sr_kemi_xval_null(&_sr_kemi_dialog_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_dialog_xval; + } + + _sr_kemi_dialog_xval.vtype = SR_KEMIP_STR; + _sr_kemi_dialog_xval.v.s = *pval; + + return &_sr_kemi_dialog_xval; + +} + static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char *key, char *pv) { str sc = STR_NULL; @@ -1582,7 +1606,7 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char return -1; } dst_pv = (pv_spec_t *)pv; - val = ki_dlg_get_var(msg, &sc, &sf, &st, &k); + val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); if(val) { memset(&dst_val, 0, sizeof(pv_value_t)); dst_val.flags |= PV_VAL_STR; @@ -2155,11 +2179,6 @@ static int ki_dlg_var_sets(sip_msg_t *msg, str *name, str *val) return (ret==0)?1:ret; } -/** - * - */ -static sr_kemi_xval_t _sr_kemi_dialog_xval = {0}; - /** * */ @@ -2289,7 +2308,7 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("dlg_get_var"), - SR_KEMIP_STR, ki_dlg_get_var, + SR_KEMIP_XVAL, ki_dlg_get_var, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:3efc0c10: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 3efc0c1093ed3c9b5a11e40e4ccc65c93f4627a4 URL: https://github.com/kamailio/kamailio/commit/3efc0c1093ed3c9b5a11e40e4ccc65c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-20T13:31:17+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/3efc0c1093ed3c9b5a11e40e4ccc65c… Patch: https://github.com/kamailio/kamailio/commit/3efc0c1093ed3c9b5a11e40e4ccc65c… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 22483876ad..bf0a663710 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -96,6 +96,7 @@ Bogdan-Andre Iancu 4.9. reg_fetch_contacts(domain, uri, profile) 4.10. reg_free_contacts(profile) 4.11. reg_send_reply() + 4.12. reg_from_user(ultable, uri, mode) 5. Event Routes @@ -162,8 +163,9 @@ Bogdan-Andre Iancu 1.43. reg_fetch_contacts usage 1.44. reg_free_contacts usage 1.45. reg_send_reply usage - 1.46. event_route[usrloc:contact-expired] usage - 1.47. $ulc(name) usage + 1.46. reg_from_user usage + 1.47. event_route[usrloc:contact-expired] usage + 1.48. $ulc(name) usage Chapter 1. Admin Guide @@ -230,6 +232,7 @@ Chapter 1. Admin Guide 4.9. reg_fetch_contacts(domain, uri, profile) 4.10. reg_free_contacts(profile) 4.11. reg_send_reply() + 4.12. reg_from_user(ultable, uri, mode) 5. Event Routes @@ -991,6 +994,7 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 4.9. reg_fetch_contacts(domain, uri, profile) 4.10. reg_free_contacts(profile) 4.11. reg_send_reply() + 4.12. reg_from_user(ultable, uri, mode) 4.1. save(domain, [, flags [, uri]]) @@ -1293,6 +1297,30 @@ save("location", "0x2"); reg_send_reply(); ... +4.12. reg_from_user(ultable, uri, mode) + + The function returns true if the SIP message comes from the user + identified by 'uri' parameter by matching the associated location + records. The matching is done with the field 'received' if it is set, + otherwise with the contact address. + + Meaning of the parameters is as follows: + * ultable - user location table (e.g., 'location') + * uri - SIP URI to identify the location records to match against. + * mode - matching mode (int) - host part (IP address) is matched + always. If mode has bit 1 set (value 1), then the port is matched + as well. If mode has bit 2 set (value 2), then the protocol is + matched as well. + + This function can be used from ANY_ROUTE. + + Example 1.46. reg_from_user usage +... +if(reg_from_user("location", "sip:alice@server.com", "0")) { + # message coming from where 'alice' sent before a REGISTER request +} +... + 5. Event Routes 5.1. event_route[usrloc:contact-expired] @@ -1302,7 +1330,7 @@ reg_send_reply(); Executed when a contact in location table has expired. The variable $ulc(exp=>...) is filled with the attributes of the expired contact. - Example 1.46. event_route[usrloc:contact-expired] usage + Example 1.47. event_route[usrloc:contact-expired] usage ... event_route[usrloc:contact-expired] { xlog("expired contact for $ulc(exp=>aor)\n"); @@ -1376,7 +1404,7 @@ event_route[usrloc:contact-expired] { The pseudo-variable accepts positive index value to access a specific contact record. - Example 1.47. $ulc(name) usage + Example 1.48. $ulc(name) usage ... if(reg_fetch_contacts("location", "$fu", "caller")) {

1 0

git:master:5e4576a5: core: mod fixup helpers for params sequence str, str, int
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 5e4576a54e7783b1ee8fde6af7919232a5e207c4 URL: https://github.com/kamailio/kamailio/commit/5e4576a54e7783b1ee8fde6af791923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T13:15:43+02:00 core: mod fixup helpers for params sequence str, str, int --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/5e4576a54e7783b1ee8fde6af791923… Patch: https://github.com/kamailio/kamailio/commit/5e4576a54e7783b1ee8fde6af791923… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 325e3d117b..925048d940 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -801,6 +801,38 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen) return -1; } +/** + * + */ +int fixup_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_spve_null(param, 1); + case 3: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_free_spve_null(param, 1); + case 3: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index ca63a5a804..8c2c766c1e 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -163,6 +163,9 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); int fixup_igp_regexp(void** param, int param_no); int fixup_free_igp_regexp(void** param, int param_no); +int fixup_ssi(void** param, int param_no); +int fixup_free_ssi(void** param, int param_no); + int fixup_sssi(void** param, int param_no); int fixup_free_sssi(void** param, int param_no);

1 0

git:master:005e8afe: registrar: added function reg_from_user(ultable, uri, mode)
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 005e8afeb6a9297bd9c752c6daaa0d99f6b4eaad URL: https://github.com/kamailio/kamailio/commit/005e8afeb6a9297bd9c752c6daaa0d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T13:17:24+02:00 registrar: added function reg_from_user(ultable, uri, mode) - return true if the message came from the user identified uri parameter by matching agains its location records --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/regpv.c Modified: src/modules/registrar/regpv.h --- Diff: https://github.com/kamailio/kamailio/commit/005e8afeb6a9297bd9c752c6daaa0d9… Patch: https://github.com/kamailio/kamailio/commit/005e8afeb6a9297bd9c752c6daaa0d9…

1 0

git:master:f0bf4ceb: registrar: docs for reg_from_user() function
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: f0bf4cebef916887cd5196dce0521d4784904ab8 URL: https://github.com/kamailio/kamailio/commit/f0bf4cebef916887cd5196dce0521d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T13:26:00+02:00 registrar: docs for reg_from_user() function --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f0bf4cebef916887cd5196dce0521d4… Patch: https://github.com/kamailio/kamailio/commit/f0bf4cebef916887cd5196dce0521d4… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index d8a3c88b57..c402ab4b20 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1813,6 +1813,52 @@ save("location", "0x2"); ... reg_send_reply(); ... +</programlisting> + </example> + </section> + <section id="registrar.f.reg_from_user"> + <title> + <function moreinfo="none">reg_from_user(ultable, uri, mode)</function> + </title> + <para> + The function returns true if the SIP message comes from the user + identified by 'uri' parameter by matching the associated location + records. The matching is done with the field 'received' if it is set, + otherwise with the contact address. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>ultable</emphasis> - user location table (e.g., 'location') + </para> + </listitem> + <listitem> + <para> + <emphasis>uri</emphasis> - SIP URI to identify the location records + to match against. + </para> + </listitem> + <listitem> + <para> + <emphasis>mode</emphasis> - matching mode (int) - host part (IP address) + is matched always. If mode has bit 1 set (value 1), then the port is + matched as well. If mode has bit 2 set (value 2), then the protocol + is matched as well. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>reg_from_user</function> usage</title> + <programlisting format="linespecific"> +... +if(reg_from_user("location", "sip:alice@server.com", "0")) { + # message coming from where 'alice' sent before a REGISTER request +} +... </programlisting> </example> </section>

1 0

git:master:fce806b5: kazoo: proper print formater %.*s instead of %*.s
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: fce806b5715286fa15148bbb8117ff3b9b4d0897 URL: https://github.com/kamailio/kamailio/commit/fce806b5715286fa15148bbb8117ff3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T09:50:27+02:00 kazoo: proper print formater %.*s instead of %*.s --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/fce806b5715286fa15148bbb8117ff3… Patch: https://github.com/kamailio/kamailio/commit/fce806b5715286fa15148bbb8117ff3… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 15d5b259a1..c7088a3c71 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1340,7 +1340,7 @@ int kz_amqp_async_query_ex(struct sip_msg* msg, char* _exchange, char* _routing_ json_obj = json_tokener_parse(json_s.s); if (json_obj==NULL) { - LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); + LM_ERR("empty or invalid JSON payload : %.*s\n", json_s.len, json_s.s); goto error; } @@ -1499,7 +1499,7 @@ int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, cha struct json_object *j = json_tokener_parse(json_s.s); if (j==NULL) { - LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); + LM_ERR("empty or invalid JSON payload : %.*s\n", json_s.len, json_s.s); return -1; }

1 0

git:master:18972def: seas: proper print formater %.*s instead of %*.s
by Daniel-Constantin Mierla 20 May '22

20 May '22

Module: kamailio Branch: master Commit: 18972def7a21506088988c1011b8aa6f13e1b8a9 URL: https://github.com/kamailio/kamailio/commit/18972def7a21506088988c1011b8aa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T09:51:44+02:00 seas: proper print formater %.*s instead of %*.s --- Modified: src/modules/seas/encode_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/18972def7a21506088988c1011b8aa6… Patch: https://github.com/kamailio/kamailio/commit/18972def7a21506088988c1011b8aa6… --- diff --git a/src/modules/seas/encode_msg.c b/src/modules/seas/encode_msg.c index 1a99c22e26..e496397888 100644 --- a/src/modules/seas/encode_msg.c +++ b/src/modules/seas/encode_msg.c @@ -324,7 +324,7 @@ int print_encoded_msg(FILE* fd,char *code,char *prefix) fprintf(fd,"MESSAGE:\n[%.*s]\n",msglen,msg); r=(i<100)?1:0; if(r){ - fprintf(fd,"%sREQUEST CODE=%d==%.*s,URI=%.*s,VERSION=%*.s\n",prefix,i, + fprintf(fd,"%sREQUEST CODE=%d==%.*s,URI=%.*s,VERSION=%.*s\n",prefix,i, payload[METHOD_CODE_IDX+1],&msg[payload[METHOD_CODE_IDX]], payload[URI_REASON_IDX+1],&msg[payload[URI_REASON_IDX]], payload[VERSION_IDX+1],&msg[payload[VERSION_IDX]]);

1 0

[kamailio/kamailio] TOPOS + RE-INVITE problem - Contact IP not updated (Issue #3118)
by chris-issy 19 May '22

19 May '22

It seems that TOPOS is not working properly on RE-INVITE and stop masking IP and contact on some RE-INVITE. When a RE-INVITE is send with Kamailio IP as Request-URI TOPOS is not operating. Note : we are using the HTABLE trick to rewrite $ru and match the call but we would need to have TOPOS re-evaluating the dialog once done. We use a standard configuration with 2 modifications. 1) in route[DISPATCH] to set the HTABLE if(is_method("INVITE")) { $sht(ct=>$ci::$ft) = $sel(contact.uri); } 2) in route[WITHINDLG] to find the call if R-URI = myself if(has_totag() && uri==myself) { if($sht(ct=>$ci::$ft) != $null && $T_reply_code > 400) $shtex(ct=>$ci::$ft) = 10 ; if($sht(ct=>$ci::$tt) != $null) { $ru = $sht(ct=>$ci::$tt); if (is_method("BYE")) $shtex(ct=>$ci::$tt) = 10 ; route(RELAY); } } As you can see in the PCAP the RE-INVITE goes directly to calling stating with the Contact not updated and the 200 OK is also sent to called party with wrong Contact info too. [topos-issue.zip](https://github.com/kamailio/kamailio/files/8730489/topos-i… This behavior breaks the BYE procedure. Any advice ? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3118 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3118(a)github.com>

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev