sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
387 discussions

[kamailio/kamailio] jansson_get not work when the key contain dot [.] charater (Issue #3658)

by Jakihiko

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>

7 months, 2 weeks

git:master:2dc4a429: modules: readme files regenerated - ims_ipsec_pcscf ... [skip ci]

by Kamailio Dev

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…

7 months, 2 weeks

git:master:e4b4b95c: ims_ipsec_pcscf: add q value to Security-Server header for IPSec

by Daniel-Constantin Mierla

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

7 months, 2 weeks

git:master:bb35e0aa: ims_ipsec_pcscf: cope better with some broken In-Dialog routing

by Daniel-Constantin Mierla

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

7 months, 2 weeks

git:master:006cca91: ims_ipsec_pcscf: docs for ipsec_destroy_by_contact()

by Daniel-Constantin Mierla

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>

7 months, 2 weeks

git:master:0a6e742e: ims_ipsec_pcscf: use core fixup helper functions

by Daniel-Constantin Mierla

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,

7 months, 2 weeks

git:master:279454ff: ims_ipsec_pcscf: new function to destroy IPSec based on Contact and received IP and port

by Daniel-Constantin Mierla

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…

7 months, 2 weeks

git:master:c10d50e1: cdp: fix for CER not containing Host-IP-Address AVP

by Daniel-Constantin Mierla

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

7 months, 2 weeks

git:master:663be945: ims_qos: docs for dialog_direction parameter

by Daniel-Constantin Mierla

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>

7 months, 2 weeks

git:master:adbb2bc9: ims_qos: option to set DLG_MOBILE_ORIGINATING for rx_add_media_component_description_avp()

by Daniel-Constantin Mierla

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

7 months, 2 weeks

← Newer
1
2
3
4
5
6
7
8
9
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023