- sr-dev - kamailio.org

git:master:57794cd1: ims_ipsec_pcscf: fill_contact() check for port size in alias
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 57794cd14205a16ed6c649fadb4efffca1561986 URL: https://github.com/kamailio/kamailio/commit/57794cd14205a16ed6c649fadb4efff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T19:01:52+01:00 ims_ipsec_pcscf: fill_contact() check for port size in alias --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/57794cd14205a16ed6c649fadb4efff… Patch: https://github.com/kamailio/kamailio/commit/57794cd14205a16ed6c649fadb4efff… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 906fc3eec53..164ded5e2c1 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -238,7 +238,7 @@ static int fill_contact( } if(alias_start != NULL && *(alias_start - 1) == ';') { char *p, *port_s, *proto_s; - char portbuf[5]; + char portbuf[6]; str alias_s; LM_DBG("contact has an alias [%.*s] - use that as the received\n", @@ -267,12 +267,16 @@ static int fill_contact( port_s = p + 1; p = _strnistr(port_s, "~", alias_s.len - ci->received_host.len); if(p != NULL) { - memset(portbuf, 0, 5); + if((p - port_s)>5) { + LM_ERR("invalid port value\n"); + return -1; + } + memset(portbuf, 0, 6); memcpy(portbuf, port_s, (p - port_s)); ci->received_port = atoi(portbuf); proto_s = p + 1; - memset(portbuf, 0, 5); + memset(portbuf, 0, 6); memcpy(portbuf, proto_s, 1); ci->received_proto = atoi(portbuf);

1 0

[kamailio/kamailio] jansson_get not work when the key contain dot [.] charater (Issue #3658)
by Jakihiko 30 Nov '23

30 Nov '23

Hi, I have sample json data as below: $var(mapjson) = {"1.1.1.1": "cloudflare", "2.2.2.2": "ANY"}; I add this line to kamailio script but it does NOT work, jansson_get("1.1.1.1", "$var(mapjson) ", “$var(domain)“); or jansson_get("1\.1\.1\.1", "$var(mapjson) ", “$var(domain)“); Seem kamailio thinks it is a **path** not **a single key**? Thanks -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3658 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3658(a)github.com>

2 3

git:master:2dc4a429: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]
by Kamailio Dev 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 2dc4a4297b0c9e6a693a82f0fe95df4d1572d7df URL: https://github.com/kamailio/kamailio/commit/2dc4a4297b0c9e6a693a82f0fe95df4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-30T11:16:57+01:00 modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README Modified: src/modules/ims_qos/README Modified: src/modules/ims_registrar_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/2dc4a4297b0c9e6a693a82f0fe95df4… Patch: https://github.com/kamailio/kamailio/commit/2dc4a4297b0c9e6a693a82f0fe95df4…

1 0

git:master:e4b4b95c: ims_ipsec_pcscf: add q value to Security-Server header for IPSec
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: e4b4b95c8933796b2cf8d5ad478e66347aa8ebf0 URL: https://github.com/kamailio/kamailio/commit/e4b4b95c8933796b2cf8d5ad478e663… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_ipsec_pcscf: add q value to Security-Server header for IPSec --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/e4b4b95c8933796b2cf8d5ad478e663… Patch: https://github.com/kamailio/kamailio/commit/e4b4b95c8933796b2cf8d5ad478e663… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 594d442710f..906fc3eec53 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -724,7 +724,7 @@ int add_security_server_header(struct sip_msg *m, ipsec_t *s) memset(sec_hdr_buf, 0, sizeof(sec_hdr_buf)); sec_header->len = snprintf(sec_hdr_buf, sizeof(sec_hdr_buf) - 1, "Security-Server: " - "ipsec-3gpp;prot=esp;mod=trans;spi-c=%d;spi-s=%d;port-c=%d;port-s=%" + "ipsec-3gpp;q=0.1;prot=esp;mod=trans;spi-c=%d;spi-s=%d;port-c=%d;port-s=%" "d;alg=%.*s;ealg=%.*s\r\n", s->spi_pc, s->spi_ps, s->port_pc, s->port_ps, s->r_alg.len, s->r_alg.s, s->r_ealg.len, s->r_ealg.s);

1 0

git:master:bb35e0aa: ims_ipsec_pcscf: cope better with some broken In-Dialog routing
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: bb35e0aa112f9c60779692c67f42b6ef2cb1b0c2 URL: https://github.com/kamailio/kamailio/commit/bb35e0aa112f9c60779692c67f42b6e… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_ipsec_pcscf: cope better with some broken In-Dialog routing --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/bb35e0aa112f9c60779692c67f42b6e… Patch: https://github.com/kamailio/kamailio/commit/bb35e0aa112f9c60779692c67f42b6e… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index dca5784c8a0..594d442710f 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -501,6 +501,35 @@ static int create_ipsec_tunnel(const struct ip_addr *remote_addr, ipsec_t *s) add_policy(sock, remote_addr, ipsec_addr, s->port_us, s->port_pc, s->spi_pc, IPSEC_POLICY_DIRECTION_IN); + /* cope with some broken In-Dialog routing */ + // SA5 UE client to P-CSCF client + // src adrr dst addr src port dst port + add_sa(sock, remote_addr, ipsec_addr, s->port_uc, s->port_pc, s->spi_ps, + s->ck, s->ik, s->r_alg, s->r_ealg); + add_policy(sock, remote_addr, ipsec_addr, s->port_uc, s->port_pc, s->spi_ps, + IPSEC_POLICY_DIRECTION_IN); + + // SA6 P-CSCF client to UE client + // src adrr dst addr src port dst port + add_sa(sock, ipsec_addr, remote_addr, s->port_pc, s->port_uc, s->spi_us, + s->ck, s->ik, s->r_alg, s->r_ealg); + add_policy(sock, ipsec_addr, remote_addr, s->port_pc, s->port_uc, s->spi_us, + IPSEC_POLICY_DIRECTION_OUT); + + // SA7 P-CSCF server to UE server + // src adrr dst addr src port dst port + add_sa(sock, ipsec_addr, remote_addr, s->port_ps, s->port_us, s->spi_uc, + s->ck, s->ik, s->r_alg, s->r_ealg); + add_policy(sock, ipsec_addr, remote_addr, s->port_ps, s->port_us, s->spi_uc, + IPSEC_POLICY_DIRECTION_OUT); + + // SA8 UE server to P-CSCF server + // src adrr dst addr src port dst port + add_sa(sock, remote_addr, ipsec_addr, s->port_us, s->port_ps, s->spi_pc, + s->ck, s->ik, s->r_alg, s->r_ealg); + add_policy(sock, remote_addr, ipsec_addr, s->port_us, s->port_ps, s->spi_pc, + IPSEC_POLICY_DIRECTION_IN); + close_mnl_socket(sock); return 0; @@ -562,6 +591,31 @@ static int destroy_ipsec_tunnel( remove_policy(sock, remote_addr, ipsec_addr, s->port_us, s->port_pc, s->spi_pc, ip_addr.af, IPSEC_POLICY_DIRECTION_IN); + /* cope with some broken In-Dialog routing */ + // SA5 UE client to P-CSCF client + remove_sa(sock, remote_addr, ipsec_addr, s->port_uc, s->port_pc, s->spi_ps, + ip_addr.af); + remove_policy(sock, remote_addr, ipsec_addr, s->port_uc, s->port_pc, + s->spi_ps, ip_addr.af, IPSEC_POLICY_DIRECTION_IN); + + // SA6 P-CSCF client to UE client + remove_sa(sock, ipsec_addr, remote_addr, s->port_pc, s->port_uc, s->spi_us, + ip_addr.af); + remove_policy(sock, ipsec_addr, remote_addr, s->port_pc, s->port_uc, + s->spi_us, ip_addr.af, IPSEC_POLICY_DIRECTION_OUT); + + // SA7 P-CSCF server to UE server + remove_sa(sock, ipsec_addr, remote_addr, s->port_ps, s->port_us, s->spi_uc, + ip_addr.af); + remove_policy(sock, ipsec_addr, remote_addr, s->port_ps, s->port_us, + s->spi_uc, ip_addr.af, IPSEC_POLICY_DIRECTION_OUT); + + // SA8 UE server to P-CSCF server + remove_sa(sock, remote_addr, ipsec_addr, s->port_us, s->port_ps, s->spi_pc, + ip_addr.af); + remove_policy(sock, remote_addr, ipsec_addr, s->port_us, s->port_ps, + s->spi_pc, ip_addr.af, IPSEC_POLICY_DIRECTION_IN); + // Release SPIs release_spi(s->spi_pc, s->spi_ps, s->port_pc, s->port_ps);

1 0

git:master:006cca91: ims_ipsec_pcscf: docs for ipsec_destroy_by_contact()
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 006cca915275f8ca3ea52a9d978961e0842f1dcd URL: https://github.com/kamailio/kamailio/commit/006cca915275f8ca3ea52a9d978961e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_ipsec_pcscf: docs for ipsec_destroy_by_contact() --- Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/006cca915275f8ca3ea52a9d978961e… Patch: https://github.com/kamailio/kamailio/commit/006cca915275f8ca3ea52a9d978961e… --- 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 d50c66ed45a..24d77440d89 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 @@ -367,6 +367,40 @@ ipsec_forward("location", "1"); <programlisting format="linespecific"> ... ipsec_destroy("location"); +... + </programlisting> + </example> + </section> + <section> + <title><function moreinfo="none">ipsec_destroy_by_contact(domain, aor, recv_host, recv_port)</function></title> + <para>The function destroys IPSec tunnel, created with ipsec_create.</para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>domain</emphasis> - Logical domain within the registrar. + If a database is used then this must be name of the table which + stores the contacts. + </para> + <para> + <emphasis>aor</emphasis> - SIP URI to match the record. + </para> + <para> + <emphasis>recv_host</emphasis> - received host to match the record. + </para> + <para> + <emphasis>recv_port</emphasis> - received port to match the record. + </para> + </listitem> + </itemizedlist> + <para>The last three parameters have to be string valies and can contain + variables.</para> + <example> + <title>ipsec_destroy_by_contact()</title> + + <programlisting format="linespecific"> +... +ipsec_destroy_by_contact("location", "...", "...", "..."); ... </programlisting> </example>

1 0

git:master:0a6e742e: ims_ipsec_pcscf: use core fixup helper functions
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 0a6e742e7d189dbf1bc2a61cdb638458b49873f4 URL: https://github.com/kamailio/kamailio/commit/0a6e742e7d189dbf1bc2a61cdb63845… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_ipsec_pcscf: use core fixup helper functions - remove unused parameter for w_destroy_by_contact() --- Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0a6e742e7d189dbf1bc2a61cdb63845… Patch: https://github.com/kamailio/kamailio/commit/0a6e742e7d189dbf1bc2a61cdb63845… --- 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 8ab2d584643..223f8d1aab1 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -59,7 +59,7 @@ static int w_create(struct sip_msg *_m, char *_d, char *_cflags); static int w_forward(struct sip_msg *_m, char *_d, char *_cflags); static int w_destroy(struct sip_msg *_m, char *_d, char *_aor); static int w_destroy_by_contact(struct sip_msg *_m, char *_d, char *_aor, - char *_received_host, char *_received_port, char *_cflags); + char *_received_host, char *_received_port); /*! \brief Fixup functions */ static int domain_fixup(void **param, int param_no); @@ -90,7 +90,8 @@ static cmd_export_t cmds[] = { 0, REQUEST_ROUTE | ONREPLY_ROUTE }, {"ipsec_destroy", (cmd_function)w_destroy, 2, unregister_fixup, 0, ANY_ROUTE }, - {"ipsec_destroy_by_contact", (cmd_function)w_destroy_by_contact, 4, unregister2_fixup, 0, ANY_ROUTE}, + {"ipsec_destroy_by_contact", (cmd_function)w_destroy_by_contact, 4, + unregister2_fixup, 0, ANY_ROUTE}, {"bind_ims_ipsec_pcscf", (cmd_function)bind_ipsec_pcscf, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0} @@ -474,26 +475,8 @@ static int unregister2_fixup(void **param, int param_no) if(param_no == 1) { return domain_fixup(param, param_no); } else { - pv_elem_t *model = NULL; - str s; - - /* convert to str */ - s.s = (char *)*param; - s.len = strlen(s.s); - - model = NULL; - if(s.len == 0) { - LM_ERR("no param!\n"); - return E_CFG; - } - if(pv_parse_format(&s, &model) < 0 || model == NULL) { - LM_ERR("wrong format [%s]!\n", s.s); - return E_CFG; - } - *param = (void *)model; - return 0; + return fixup_spve_all(param, param_no); } - return E_CFG; } /*! \brief @@ -532,9 +515,8 @@ static int w_destroy(struct sip_msg *_m, char *_d, char *_aor) } static int w_destroy_by_contact(struct sip_msg *_m, char *_d, char *_aor, - char *_received_host, char *_received_port, char *_cflags) + char *_received_host, char *_received_port) { - pv_elem_t *model; str aor; str received_host; str received_port; @@ -545,25 +527,21 @@ static int w_destroy_by_contact(struct sip_msg *_m, char *_d, char *_aor, return -1; } - model = (pv_elem_t *)_aor; - if(pv_printf_s(_m, model, &aor) < 0) { - LM_ERR("error - cannot print the format\n"); + if(fixup_get_svalue(_m, (gparam_t *)_aor, &aor) < 0) { + LM_ERR("failed to get aor parameter\n"); return -1; } - LM_DBG("URI: %.*s\n", aor.len, aor.s); - - model = (pv_elem_t *)_received_host; - if(pv_printf_s(_m, model, &received_host) < 0) { - LM_ERR("error - cannot print the format\n"); + if(fixup_get_svalue(_m, (gparam_t *)_received_host, &received_host) < 0) { + LM_ERR("failed to get received host parameter\n"); return -1; } - LM_DBG("Received-Host: %.*s\n", received_host.len, received_host.s); - - model = (pv_elem_t *)_received_port; - if(pv_printf_s(_m, model, &received_port) < 0) { - LM_ERR("error - cannot print the format\n"); + if(fixup_get_svalue(_m, (gparam_t *)_received_port, &received_port) < 0) { + LM_ERR("failed to get received host parameter\n"); return -1; } + + LM_DBG("URI: %.*s\n", aor.len, aor.s); + LM_DBG("Received-Host: %.*s\n", received_host.len, received_host.s); LM_DBG("Received-Port: %.*s\n", received_port.len, received_port.s); if(str2sint(&received_port, &port) != 0) { LM_ERR("error - cannot convert %.*s to an int!\n", received_port.len,

1 0

git:master:279454ff: ims_ipsec_pcscf: new function to destroy IPSec based on Contact and received IP and port
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 279454ff8d4e5804d92a8690c4de3a507efbc44f URL: https://github.com/kamailio/kamailio/commit/279454ff8d4e5804d92a8690c4de3a5… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_ipsec_pcscf: new function to destroy IPSec based on Contact and received IP and port - the default ipsec_destroy() cannot be used to used destroy IPSec in any route and needed to be used exactly after all the de-registration process was complete. But, as per the kamailio P-CSCF config script, ipsec_destroy() was used in reply route of NATPING, which didn't have any idea about SIP Register message used for de-registration. Thus, resulting in IPSec not being destroyed even after de-registration was complete. - the newly introduced function ipsec_destroy_by_contact() takes domain, contact, received host and received port in order to determine the exact UE's IPSec tunnel to destroy. --- 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 --- Diff: https://github.com/kamailio/kamailio/commit/279454ff8d4e5804d92a8690c4de3a5… Patch: https://github.com/kamailio/kamailio/commit/279454ff8d4e5804d92a8690c4de3a5…

1 0

git:master:c10d50e1: cdp: fix for CER not containing Host-IP-Address AVP
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: c10d50e10bc5f2c3f6a73dc685f631b3367f2481 URL: https://github.com/kamailio/kamailio/commit/c10d50e10bc5f2c3f6a73dc685f631b… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 cdp: fix for CER not containing Host-IP-Address AVP --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/c10d50e10bc5f2c3f6a73dc685f631b… Patch: https://github.com/kamailio/kamailio/commit/c10d50e10bc5f2c3f6a73dc685f631b… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 74d119b70f2..0732822e0fa 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -132,8 +132,10 @@ int sm_process( case Wait_Conn_Ack: switch(event) { case I_Rcv_Conn_Ack: - I_Snd_CER(p); p->state = Wait_I_CEA; + I_Snd_CER(p); + if (p->state == Closed) + sm_process(p, Start, 0, 1, 0); break; case I_Rcv_Conn_NAck: Cleanup(p, p->I_sock); @@ -656,6 +658,7 @@ void I_Snd_CER(peer *p) } addr_u; socklen_t addrlen; char x[18]; + int ret = 0; cer = AAANewMessage(Code_CE, 0, 0, 0); if(!cer) @@ -663,10 +666,16 @@ void I_Snd_CER(peer *p) cer->hopbyhopId = next_hopbyhop(); cer->endtoendId = next_endtoend(); addrlen = sizeof(addr_u); - if(getsockname(p->I_sock, &(addr_u.addr), &addrlen) == -1) { + if((ret = getsockname(p->I_sock, &(addr_u.addr), &addrlen)) == -1) { LM_ERR("I_Snd_CER(): Error on finding local host address > %s\n", strerror(errno)); - } else { + Cleanup(p,p->I_sock); + p->state = Closed; + AAAFreeMessage(&cer); + return; + } + + if (ret != -1) { switch(addr_u.addr.sa_family) { case AF_INET: set_2bytes(x, 1);

1 0

git:master:663be945: ims_qos: docs for dialog_direction parameter
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 663be945f41d026c1a16f498544a12e2fb58c53c URL: https://github.com/kamailio/kamailio/commit/663be945f41d026c1a16f498544a12e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_qos: docs for dialog_direction parameter --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/663be945f41d026c1a16f498544a12e… Patch: https://github.com/kamailio/kamailio/commit/663be945f41d026c1a16f498544a12e… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index 302e492b886..bbc75a1f1f0 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -553,6 +553,28 @@ modparam("ims_qos", "suspend_transaction", 0) <programlisting format="linespecific"> ... modparam("ims_qos", "recv_mode", 1) +... + </programlisting> + </example> + </section> + + <section> + <title><varname>dialog_direction</varname> integer</title> + + <para>If set to 1, DLG_MOBILE_ORIGINATING is set to + rx_add_media_component_description_avp() instead of DLG_MOBILE_REGISTER + (which corresponds to value 3). + </para> + + <para><emphasis> Default value is 3</emphasis></para> + + <example> + <title><varname>dialog_direction</varname> parameter + usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_qos", "dialog_direction", 1) ... </programlisting> </example>

1 0

git:master:adbb2bc9: ims_qos: option to set DLG_MOBILE_ORIGINATING for rx_add_media_component_description_avp()
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: adbb2bc992d1582aece9d075da6329e0643fb5e3 URL: https://github.com/kamailio/kamailio/commit/adbb2bc992d1582aece9d075da6329e… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_qos: option to set DLG_MOBILE_ORIGINATING for rx_add_media_component_description_avp() - alternative to DLG_MOBILE_REGISTER that can be set with mod param dialog_direction --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/ims_qos_mod.h Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/adbb2bc992d1582aece9d075da6329e… Patch: https://github.com/kamailio/kamailio/commit/adbb2bc992d1582aece9d075da6329e… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index eaa323dcd5b..428a898df40 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -166,7 +166,8 @@ int omit_flow_ports = 0; int rs_default_bandwidth = 0; int rr_default_bandwidth = 0; -ims_qos_params_t _imsqos_params = {.recv_mode = 0}; +ims_qos_params_t _imsqos_params = { + .recv_mode = 0, .dlg_direction = DLG_MOBILE_REGISTER}; /* commands wrappers and fixups */ static int w_rx_aar(struct sip_msg *msg, char *route, char *dir, char *id, @@ -255,7 +256,9 @@ static param_export_t params[] = {{"rx_dest_realm", PARAM_STR, &rx_dest_realm}, &regex_sdp_ip_prefix_to_maintain_in_fd}, {"include_rtcp_fd", INT_PARAM, &include_rtcp_fd}, {"suspend_transaction", INT_PARAM, &_ims_qos_suspend_transaction}, - {"recv_mode", PARAM_INT, &_imsqos_params.recv_mode}, {0, 0, 0}}; + {"recv_mode", PARAM_INT, &_imsqos_params.recv_mode}, + {"dialog_direction", PARAM_INT, &_imsqos_params.dlg_direction}, + {0, 0, 0}}; /** module exports */ @@ -277,6 +280,10 @@ static int mod_init(void) callback_singleton = shm_malloc(sizeof(int)); *callback_singleton = 0; + if(_imsqos_params.dlg_direction != DLG_MOBILE_ORIGINATING) { + _imsqos_params.dlg_direction = DLG_MOBILE_REGISTER; + } + /*register space for event processor*/ register_procs(1); diff --git a/src/modules/ims_qos/ims_qos_mod.h b/src/modules/ims_qos/ims_qos_mod.h index fe061ec9a92..28d59d1d191 100644 --- a/src/modules/ims_qos/ims_qos_mod.h +++ b/src/modules/ims_qos/ims_qos_mod.h @@ -52,6 +52,7 @@ typedef struct ims_qos_params { int recv_mode; + int dlg_direction; } ims_qos_params_t; /** callback functions */ diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 19e66b8fe89..91ed4345a42 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -82,6 +82,7 @@ extern str af_signaling_ip; extern str af_signaling_ip6; extern str component_media_type; extern str flow_protocol; +extern ims_qos_params_t _imsqos_params; str IMS_Serv_AVP_val = {"IMS Services", 12}; str IMS_Em_Serv_AVP_val = {"Emergency IMS Call", 18}; @@ -613,7 +614,6 @@ int add_media_components(AAAMessage *aar, struct sip_msg *req, ipA = req_sdp_session->ip_addr; portA = req_sdp_stream->port; - ipB = rpl_sdp_session->ip_addr; portB = rpl_sdp_stream->port; } @@ -1130,7 +1130,7 @@ int rx_send_aar_register(struct sip_msg *msg, AAASession *auth, &via_host, &port_from, ip_version == AF_INET ? &af_signaling_ip : &af_signaling_ip6, &port_to, &flow_protocol, &raw_stream, &raw_stream, - DLG_MOBILE_REGISTER, AVP_EPC_Flow_Usage_AF_Signaling); + _imsqos_params.dlg_direction, AVP_EPC_Flow_Usage_AF_Signaling); /* Add specific action AVP's */ rx_add_specific_action_avp(aar, 1); // CHARGING_CORRELATION_EXCHANGE

1 0

git:master:aced7f10: ims_qos: docs for recv_mode parameter
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: aced7f10a13dc7c578191514c29b2c8e060e11d3 URL: https://github.com/kamailio/kamailio/commit/aced7f10a13dc7c578191514c29b2c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_qos: docs for recv_mode parameter --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aced7f10a13dc7c578191514c29b2c8… Patch: https://github.com/kamailio/kamailio/commit/aced7f10a13dc7c578191514c29b2c8… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index 06350ae8e92..302e492b886 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -532,6 +532,27 @@ modparam("ims_qos", "rr_default_bandwidth", 2000) <programlisting format="linespecific"> ... modparam("ims_qos", "suspend_transaction", 0) +... + </programlisting> + </example> + </section> + + <section> + <title><varname>recv_mode</varname> integer</title> + + <para>If set to 0, rx_aar_register() takes the received-from address values + (IP, port, proto) from the IP frame. If set to 1, it takes them from + Via header. </para> + + <para><emphasis> Default value is 0</emphasis></para> + + <example> + <title><varname>recv_mode</varname> parameter + usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_qos", "recv_mode", 1) ... </programlisting> </example>

1 0

git:master:b00190ff: ims_qos: option to use received ip, port and proto from via
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: b00190ff6927d5ddfcc0ed78a0eb701627eaadbb URL: https://github.com/kamailio/kamailio/commit/b00190ff6927d5ddfcc0ed78a0eb701… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_qos: option to use received ip, port and proto from via - can help with Rx_AAR_Register when EPC is behind a NAT - there could be an Rx AAR failure due to wrong IP address in Framed IP address field of Rx AAR message when EPC is behind a NAT --- Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/ims_qos_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/b00190ff6927d5ddfcc0ed78a0eb701… Patch: https://github.com/kamailio/kamailio/commit/b00190ff6927d5ddfcc0ed78a0eb701… --- diff --git a/src/modules/ims_qos/ims_qos_mod.c b/src/modules/ims_qos/ims_qos_mod.c index 82057650274..eaa323dcd5b 100644 --- a/src/modules/ims_qos/ims_qos_mod.c +++ b/src/modules/ims_qos/ims_qos_mod.c @@ -166,6 +166,8 @@ int omit_flow_ports = 0; int rs_default_bandwidth = 0; int rr_default_bandwidth = 0; +ims_qos_params_t _imsqos_params = {.recv_mode = 0}; + /* commands wrappers and fixups */ static int w_rx_aar(struct sip_msg *msg, char *route, char *dir, char *id, int id_type, int cfg_type); @@ -253,7 +255,7 @@ static param_export_t params[] = {{"rx_dest_realm", PARAM_STR, &rx_dest_realm}, &regex_sdp_ip_prefix_to_maintain_in_fd}, {"include_rtcp_fd", INT_PARAM, &include_rtcp_fd}, {"suspend_transaction", INT_PARAM, &_ims_qos_suspend_transaction}, - {0, 0, 0}}; + {"recv_mode", PARAM_INT, &_imsqos_params.recv_mode}, {0, 0, 0}}; /** module exports */ @@ -1463,19 +1465,30 @@ static int w_rx_aar_register( goto error; } - //we use the received IP address for the framed_ip_address - recv_ip.s = ip_addr2a(&msg->rcv.src_ip); - recv_ip.len = strlen(ip_addr2a(&msg->rcv.src_ip)); + char buff[IP_ADDR_MAX_STR_SIZE]; + if(_imsqos_params.recv_mode == 0) { + //we use the received IP address for the framed_ip_address + recv_ip.s = ip_addr2a(&msg->rcv.src_ip); + recv_ip.len = strlen(ip_addr2a(&msg->rcv.src_ip)); + + recv_port = msg->rcv.src_port; + recv_proto = msg->rcv.proto; + } else { + memset(&recv_ip, 0, sizeof(str)); + memcpy(&buff, vb->host.s, vb->host.len); + buff[vb->host.len] = 0; + recv_ip.s = buff; + recv_ip.len = strlen(buff); + recv_port = via_port; + recv_proto = via_proto; + } ip_version = check_ip_version(recv_ip); if(!ip_version) { LM_ERR("check_ip_version returned 0 \n"); goto error; } - recv_port = msg->rcv.src_port; - recv_proto = msg->rcv.proto; - LM_DBG("Message received IP address is: [%.*s]\n", recv_ip.len, recv_ip.s); LM_DBG("Message via is [%d://%.*s:%d]\n", vb->proto, vb->host.len, vb->host.s, via_port); diff --git a/src/modules/ims_qos/ims_qos_mod.h b/src/modules/ims_qos/ims_qos_mod.h index 55a5a9bb356..fe061ec9a92 100644 --- a/src/modules/ims_qos/ims_qos_mod.h +++ b/src/modules/ims_qos/ims_qos_mod.h @@ -49,6 +49,11 @@ #define MOD_NAME "ims_qos" +typedef struct ims_qos_params +{ + int recv_mode; +} ims_qos_params_t; + /** callback functions */ struct AAAMessage;

1 0

git:master:9a552096: ims_registrar_pcscf: docs for delete_delay parameter
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 9a552096eea7e78baeb16d32278ebd4d586eef82 URL: https://github.com/kamailio/kamailio/commit/9a552096eea7e78baeb16d32278ebd4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_registrar_pcscf: docs for delete_delay parameter --- Modified: src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9a552096eea7e78baeb16d32278ebd4… Patch: https://github.com/kamailio/kamailio/commit/9a552096eea7e78baeb16d32278ebd4… --- diff --git a/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml b/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml index 3f6b36d5c8b..85b532c08df 100644 --- a/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml +++ b/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml @@ -265,6 +265,25 @@ modparam("ims_registrar_pcscf", "force_icscf_uri", "sip:icscf.mnc001.mcc001.3gpp <programlisting format="linespecific"> ... modparam("ims_registrar_pcscf", "reginfo_queue_size_threshold", 42) +... + </programlisting> + </example> + </section> + + <section> + <title><varname>delete_delay</varname> (int)</title> + + <para>If set greater than 0, the delete of a pcontact record is delayed + with its value instead of being done immediately.</para> + + <para><emphasis>Default value is 0 (delete immediately).</emphasis></para> + + <example> + <title><varname>delete_delay</varname> parameter usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_registrar_pcscf", "delete_delay", 10) ... </programlisting> </example>

1 0

git:master:3b2bffc9: ims_usrloc_scscf: improve contact lookup for an IMPU
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: 3b2bffc92ab0f684f8731c02f080d8df4392de5d URL: https://github.com/kamailio/kamailio/commit/3b2bffc92ab0f684f8731c02f080d8d… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_usrloc_scscf: improve contact lookup for an IMPU - --- Modified: src/modules/ims_usrloc_scscf/contact_dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/3b2bffc92ab0f684f8731c02f080d8d… Patch: https://github.com/kamailio/kamailio/commit/3b2bffc92ab0f684f8731c02f080d8d… --- diff --git a/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c b/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c index ad166ea6557..c872fbef4dc 100644 --- a/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c +++ b/src/modules/ims_usrloc_scscf/contact_dlg_handlers.c @@ -54,8 +54,10 @@ static inline int find_contact_from_impu( impurecord_t *impu, str *search_aor, ucontact_t **scontact) { impu_contact_t *impucontact; - short i_searchlen; + short i_searchlen, c_searchlen, alias_searchlen; char *s_term; + char *c_term; + char *alias_term; if(!search_aor) return 1; @@ -63,29 +65,57 @@ static inline int find_contact_from_impu( LM_DBG("Looking for contact [%.*s] for IMPU [%.*s]\n", search_aor->len, search_aor->s, impu->public_identity.len, impu->public_identity.s); - s_term = memchr(search_aor->s, '@', search_aor->len); + + /* Filter out sip: and anything before @ from search URI */ + s_term = strstr(search_aor->s, "@"); if(!s_term) { - LM_DBG("Malformed contact...bailing search\n"); - return 1; + s_term = strstr(search_aor->s, ":"); + } + s_term += 1; + if(s_term - search_aor->s >= search_aor->len) { + goto error; + } + i_searchlen = search_aor->len - (s_term - search_aor->s); + + /* Compare the entire contact including alias, if not until alias IP */ + alias_term = strstr(s_term, "~"); + if(!alias_term) { + alias_searchlen = i_searchlen; + } else { + alias_term += 1; + alias_searchlen = alias_term - s_term; } - i_searchlen = s_term - search_aor->s; impucontact = impu->linked_contacts.head; while(impucontact) { - if(impucontact->contact - && impucontact->contact->aor.s[i_searchlen] == '@' - && (memcmp(impucontact->contact->aor.s, search_aor->s, - i_searchlen) - == 0)) { - *scontact = impucontact->contact; - return 0; + if(impucontact->contact) { + + c_term = strstr(impucontact->contact->c.s, "@"); + if(!c_term) { + c_term = strstr(impucontact->contact->c.s, ":"); + } + c_term += 1; + c_searchlen = impucontact->contact->c.len + - (c_term - impucontact->contact->c.s); + + LM_DBG("Comparing [%.*s] and [%.*s]\n", i_searchlen, s_term, + c_searchlen, c_term); + LM_DBG("Comparing [%.*s] and [%.*s]\n", alias_searchlen, s_term, + c_searchlen, c_term); + if((strncmp(c_term, s_term, i_searchlen) == 0) + || (strncmp(c_term, s_term, alias_searchlen) == 0)) { + *scontact = impucontact->contact; + return 0; + } } if(impucontact->contact) - LM_DBG("Skipping %.*s\n", impucontact->contact->aor.len, - impucontact->contact->aor.s); + LM_DBG("Skipping %.*s\n", impucontact->contact->c.len, + impucontact->contact->c.s); impucontact = impucontact->next; } +error: + LM_INFO("malformed contact, bailing search\n"); return 1; }

1 0

git:master:bc3e758f: ims_registrar_pcscf: option to delay record expiration instead of immediate delete
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: bc3e758fb32285ba8d0f9f9e1a1489dd1894468d URL: https://github.com/kamailio/kamailio/commit/bc3e758fb32285ba8d0f9f9e1a1489d… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 ims_registrar_pcscf: option to delay record expiration instead of immediate delete - new parameter delete_delay --- Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.c Modified: src/modules/ims_registrar_pcscf/ims_registrar_pcscf_mod.h Modified: src/modules/ims_registrar_pcscf/notify.c Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/bc3e758fb32285ba8d0f9f9e1a1489d… Patch: https://github.com/kamailio/kamailio/commit/bc3e758fb32285ba8d0f9f9e1a1489d…

1 0

git:master:e49469c0: kamctl: mysql/ims_usrloc_scscf-create.sql - support for larger record_route values
by Daniel-Constantin Mierla 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: e49469c0ce534879a7d366c71374356e7883c6f2 URL: https://github.com/kamailio/kamailio/commit/e49469c0ce534879a7d366c71374356… Author: Supreeth Herle <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-30T10:18:47+01:00 kamctl: mysql/ims_usrloc_scscf-create.sql - support for larger record_route values --- Modified: utils/kamctl/mysql/ims_usrloc_scscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/e49469c0ce534879a7d366c71374356… Patch: https://github.com/kamailio/kamailio/commit/e49469c0ce534879a7d366c71374356… --- diff --git a/utils/kamctl/mysql/ims_usrloc_scscf-create.sql b/utils/kamctl/mysql/ims_usrloc_scscf-create.sql index ae7bd93a545..21c816c34e9 100644 --- a/utils/kamctl/mysql/ims_usrloc_scscf-create.sql +++ b/utils/kamctl/mysql/ims_usrloc_scscf-create.sql @@ -49,7 +49,7 @@ CREATE TABLE `subscriber` ( `call_id` varchar(50) NOT NULL, `from_tag` varchar(50) NOT NULL, `to_tag` varchar(50) NOT NULL, - `record_route` varchar(50) NOT NULL, + `record_route` TEXT NOT NULL, `sockinfo_str` varchar(50) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `watcher_uri` (`event`,`watcher_contact`,`presentity_uri`)

1 0

[kamailio/kamailio] nathelper: Add Max-Forwards to keep-alive (PR #3657)
by Kristian Høgh 30 Nov '23

30 Nov '23

#### 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/3657 -- Commit Summary -- * nathelper: Add Max-Forwards to keep-alive -- File Changes -- M src/modules/nathelper/sip_pinger.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3657.patch https://github.com/kamailio/kamailio/pull/3657.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3657 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3657(a)github.com>

2 2

git:master:e1d9bec0: nathelper: add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 (GH 3657)
by Henning Westerholt 30 Nov '23

30 Nov '23

Module: kamailio Branch: master Commit: e1d9bec0e16727325330c822c21ae29237c7812a URL: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… Author: Kristian Hogh <kfh(a)uni-tel.dk> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-11-30T06:21:25Z nathelper: add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 (GH 3657) - add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 - similar patch is used from several large customer installations since many years - GH #3657 with small formatting change --- Modified: src/modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… Patch: https://github.com/kamailio/kamailio/commit/e1d9bec0e16727325330c822c21ae29… --- diff --git a/src/modules/nathelper/sip_pinger.h b/src/modules/nathelper/sip_pinger.h index 733e38f21c3..b3ee4d39f3d 100644 --- a/src/modules/nathelper/sip_pinger.h +++ b/src/modules/nathelper/sip_pinger.h @@ -151,7 +151,7 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, + ruid->len + 1 + 8 + 1 + 8 + s_len(CRLF "To: ") + curi->len + s_len(CRLF "Call-ID: ") + sipping_callid.len + 1 + 8 + 1 + 8 + 1 + s->address_str.len + s_len(CRLF "CSeq: 1 ") - + sipping_method.len + + sipping_method.len + s_len(CRLF "Max-Forwards: 70") + s_len(CRLF "Content-Length: 0" CRLF CRLF) > MAX_SIPPING_SIZE) { LM_ERR("len exceeds %d\n", MAX_SIPPING_SIZE); @@ -205,6 +205,7 @@ static inline char *build_sipping(str *curi, struct socket_info *s, str *path, append_str(p, s->address_str.s, s->address_str.len); append_fix(p, CRLF "CSeq: 1 "); append_str(p, sipping_method.s, sipping_method.len); + append_fix(p, CRLF "Max-Forwards: 70"); append_fix(p, CRLF "Content-Length: 0" CRLF CRLF); *len_p = p - buf;

1 0

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,stretch #2536
by kamailio＠sipwise.com 30 Nov '23

30 Nov '23

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 5

Jenkins build became unstable: kamailio57-nightly-binaries » amd64,stretch #36
by kamailio＠sipwise.com 30 Nov '23

30 Nov '23

See <https://kamailio.sipwise.com/job/kamailio57-nightly-binaries/architecture=a…>

1 1

[kamailio/kamailio] group include ktls no longer works after 7f07a6ef9ae90baee4281394d0dcf505b30c8fcb (Issue #3660)
by Anthony Messina 29 Nov '23

29 Nov '23

After 7f07a6ef9ae90baee4281394d0dcf505b30c8fcb, building the ktls group doesn't work as it's not included in the #else statement. I don't have a need for ktlsa at this point. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3660 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3660(a)github.com>

2 4

git:5.7:b29d5808: Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set
by Victor Seva 29 Nov '23

29 Nov '23

Module: kamailio Branch: 5.7 Commit: b29d5808505aa072fd23b59adf7943fb13ea98a2 URL: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-29T17:25:05+01:00 Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set fix #3660 (cherry picked from commit aef29af56cabaf626e2ae552ae69c3cd2f692a27) --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… Patch: https://github.com/kamailio/kamailio/commit/b29d5808505aa072fd23b59adf7943f… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 028c34da711..ee4ec90e83f 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -407,6 +407,9 @@ ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) else +# pkg tls module with curl +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa) endif @@ -540,4 +543,3 @@ module_group_krtp_media_server=$(mod_list_rtp_media_server) # list of static modules # static_modules:= -

1 0

git:master:aef29af5: Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set
by Victor Seva 29 Nov '23

29 Nov '23

Module: kamailio Branch: master Commit: aef29af56cabaf626e2ae552ae69c3cd2f692a27 URL: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-29T17:21:59+01:00 Makefile.groups: fix ktls when KTLS_INCLUDE_TLSA is not set fix #3660 --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… Patch: https://github.com/kamailio/kamailio/commit/aef29af56cabaf626e2ae552ae69c3c… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index b428394d31d..48e06e0646c 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -411,6 +411,9 @@ ifeq ($(KTLS_INCLUDE_TLSA),yes) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) $(mod_list_tlsa) else +# pkg tls module with curl +module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) + # pkg tlsa module module_group_ktlsa=$(mod_list_tlsa) endif @@ -547,4 +550,3 @@ module_group_krtp_media_server=$(mod_list_rtp_media_server) # list of static modules # static_modules:= -

1 0

git:master:2b27aba7: topos: use defined values for internal contact mode
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 2b27aba7f4f396e4ebd894255abfa8ce20950313 URL: https://github.com/kamailio/kamailio/commit/2b27aba7f4f396e4ebd894255abfa8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T13:22:35+01:00 topos: use defined values for internal contact mode --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/2b27aba7f4f396e4ebd894255abfa8c… Patch: https://github.com/kamailio/kamailio/commit/2b27aba7f4f396e4ebd894255abfa8c… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 8ea8bb39c7e..7bcb2fea3c9 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -123,7 +123,7 @@ static int _tps_eventrt_receiving = -1; static str _tps_eventrt_receiving_name = str_init("topos:msg-receiving"); str _tps_contact_host = str_init(""); -int _tps_contact_mode = 0; +int _tps_contact_mode = TPS_CONTACT_MODE_SKEYUSER; str _tps_cparam_name = str_init("tps"); str _tps_xavu_cfg = STR_NULL; @@ -310,7 +310,7 @@ static int mod_init(void) if(sruid_init(&_tps_sruid, '-', "tpsh", SRUID_INC) < 0) return -1; - if(_tps_contact_mode == 2 + if(_tps_contact_mode == TPS_CONTACT_MODE_XAVPUSER && (_tps_xavu_cfg.len <= 0 || _tps_xavu_field_acontact.len <= 0 || _tps_xavu_field_bcontact.len <= 0)) { LM_ERR("contact_mode parameter is 2," diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 4d680e53f45..e0e1c211923 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -324,7 +324,8 @@ int tps_dlg_message_update(sip_msg_t *msg, tps_data_t *ptsd, int ctmode) return -1; } - if(ctmode == 1 || ctmode == 2) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER + || ctmode == TPS_CONTACT_MODE_XAVPUSER) { if(msg->parsed_uri.sip_params.len < TPS_TUUID_MIN_LEN) { LM_DBG("not an expected param format\n"); return 1; @@ -962,7 +963,9 @@ int tps_request_received(sip_msg_t *msg, int dialog) LM_DBG("use branch for routing information, request from direction " "%d\n", direction); - if(tps_reappend_route(msg, &stsd, &stsd.s_rr, (direction == TPS_DIR_UPSTREAM) ? 0 : 1) < 0) { + if(tps_reappend_route(msg, &stsd, &stsd.s_rr, + (direction == TPS_DIR_UPSTREAM) ? 0 : 1) + < 0) { LM_ERR("failed to reappend s-route\n"); return -1; } diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 63951386622..fc0c2835a33 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -244,7 +244,8 @@ int tps_storage_fill_contact( if(_tps_contact_host.len) contact_len = sv.len - puri.host.len + _tps_contact_host.len; - if(ctmode == 1 || ctmode == 2) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER + || ctmode == TPS_CONTACT_MODE_XAVPUSER) { cparam_len = _tps_cparam_name.len; } else { cparam_len = 0; @@ -285,9 +286,10 @@ int tps_storage_fill_contact( if(sv.s[i] == ':') break; } - if(ctmode == 1 || ctmode == 2) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER + || ctmode == TPS_CONTACT_MODE_XAVPUSER) { /* create new URI parameter for Contact header */ - if(ctmode == 1) { + if(ctmode == TPS_CONTACT_MODE_RURIUSER) { if(dir == TPS_DIR_DOWNSTREAM) { /* extract the contact address */ if(parse_headers(msg, HDR_CONTACT_F, 0) < 0 @@ -332,7 +334,7 @@ int tps_storage_fill_contact( msg->parsed_uri.user.len); td->cp += msg->parsed_uri.user.len; } - } else if(ctmode == 2) { + } else if(ctmode == TPS_CONTACT_MODE_XAVPUSER) { if(dir == TPS_DIR_DOWNSTREAM) { /* extract the a contact */ vavu = xavu_get_child_with_sval( @@ -356,8 +358,8 @@ int tps_storage_fill_contact( } } - if(!((ctmode == 1) && (dir == TPS_DIR_DOWNSTREAM) - && (curi.user.len <= 0))) { + if(!((ctmode == TPS_CONTACT_MODE_RURIUSER) + && (dir == TPS_DIR_DOWNSTREAM) && (curi.user.len <= 0))) { *td->cp = '@'; td->cp++; } diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index 4c2585a1ff6..245a1595652 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -37,6 +37,10 @@ #define TPS_IFLAG_INIT 1 #define TPS_IFLAG_DLGON 2 +#define TPS_CONTACT_MODE_SKEYUSER 0 +#define TPS_CONTACT_MODE_RURIUSER 1 +#define TPS_CONTACT_MODE_XAVPUSER 2 + #define TPS_DBU_CONTACT (1 << 0) #define TPS_DBU_RPLATTRS (1 << 1) #define TPS_DBU_ARR (1 << 2)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev