- sr-dev - kamailio.org

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

[kamailio/kamailio] core: timer_proc don't execute timers on destroy_modules_phase (PR #3649)
by Victor Seva 28 Nov '23

28 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:  - [x] PR should be backported to stable branches - [ ] Tested changes locally #### Description If kamailio is in the shutdown phase proc timers should not be executed since memory objects are getting destroyed and cores could happen You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3649 -- Commit Summary -- * core: timer_proc don't execute timers on destroy_modules_phase -- File Changes -- M src/core/timer_proc.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3649.patch https://github.com/kamailio/kamailio/pull/3649.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3649 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3649(a)github.com>

2 6

git:master:1194f597: core: timer_proc don't execute timers on shutdown phase
by Victor Seva 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 1194f59738e87fcbf0d61c95d1d481e5fbb46784 URL: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-28T13:03:38+01:00 core: timer_proc don't execute timers on shutdown phase --- Modified: src/core/timer_proc.c --- Diff: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… Patch: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… --- diff --git a/src/core/timer_proc.c b/src/core/timer_proc.c index 0b04cf65131..55bd98dab9c 100644 --- a/src/core/timer_proc.c +++ b/src/core/timer_proc.c @@ -29,6 +29,7 @@ #include "pt.h" #include "ut.h" #include "mem/shm_mem.h" +#include "sr_module.h" #include <unistd.h> @@ -76,6 +77,9 @@ int fork_basic_timer(int child_id, char *desc, int make_sock, timer_function *f, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep(interval); cfg_update(); f(get_ticks(), param); /* ticks in s for compatibility with old @@ -99,6 +103,9 @@ int fork_basic_timer_w(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep(interval); cfg_update(); f(get_ticks(), worker, @@ -141,6 +148,9 @@ int fork_basic_utimer(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep_us(uinterval); cfg_update(); ts = get_ticks_raw(); @@ -165,6 +175,9 @@ int fork_basic_utimer_w(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep_us(uinterval); cfg_update(); ts = get_ticks_raw(); @@ -273,6 +286,9 @@ int fork_sync_timer(int child_id, char *desc, int make_sock, timer_function *f, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } if(ts2 > interval) sleep_us(1000); /* 1 millisecond sleep to catch up */ else @@ -324,6 +340,9 @@ int fork_sync_utimer(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } if(ts2 > uinterval) sleep_us(1); else

1 0

git:master:9117e5dd: modules: readme files regenerated - jansson ... [skip ci]
by Kamailio Dev 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 9117e5ddbffe2a202d24eb39a509835f14090486 URL: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-28T10:32:15+01:00 modules: readme files regenerated - jansson ... [skip ci] --- Modified: src/modules/jansson/README --- Diff: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835… Patch: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835…

1 0

git:master:3b47b566: jansson: rename parameter for janssonmod_get_field()
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 3b47b566477baedf687635b2b3f0e2525987e709 URL: https://github.com/kamailio/kamailio/commit/3b47b566477baedf687635b2b3f0e25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:41+01:00 jansson: rename parameter for janssonmod_get_field() - more suggestive relation with the meaning of the field name parameter --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/3b47b566477baedf687635b2b3f0e25… Patch: https://github.com/kamailio/kamailio/commit/3b47b566477baedf687635b2b3f0e25… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 58a698446ca..dab15d488f3 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -95,22 +95,22 @@ int janssonmod_get(struct sip_msg *msg, char *path_in, char *src_in, char *dst) } int janssonmod_get_field( - struct sip_msg *msg, char *path_in, char *src_in, char *dst) + struct sip_msg *msg, char *field_in, char *src_in, char *dst) { str src_s; - str path_s; + str field_s; - if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { - ERR("cannot get json string value\n"); + if(fixup_get_svalue(msg, (gparam_p)field_in, &field_s) != 0) { + ERR("cannot get field name string value\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_p)path_in, &path_s) != 0) { - ERR("cannot get path string value\n"); + if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { + ERR("cannot get json string value\n"); return -1; } - return janssonmod_get_helper(msg, &path_s, 1, &src_s, (pv_spec_t *)dst); + return janssonmod_get_helper(msg, &field_s, 1, &src_s, (pv_spec_t *)dst); } int janssonmod_pv_get( diff --git a/src/modules/jansson/jansson_funcs.h b/src/modules/jansson/jansson_funcs.h index ab1c029821f..829aa144c19 100644 --- a/src/modules/jansson/jansson_funcs.h +++ b/src/modules/jansson/jansson_funcs.h @@ -28,7 +28,7 @@ int janssonmod_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); int janssonmod_get_field( - struct sip_msg *msg, char *path_in, char *src_in, char *dst); + struct sip_msg *msg, char *field_in, char *src_in, char *dst); int janssonmod_pv_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in,

1 0

git:master:9eeab439: jansson: docs updated for jansson_get_field()
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 9eeab4396d8ec57781244ab80c4a96539d7338ec URL: https://github.com/kamailio/kamailio/commit/9eeab4396d8ec57781244ab80c4a965… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:41+01:00 jansson: docs updated for jansson_get_field() --- Modified: src/modules/jansson/doc/jansson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9eeab4396d8ec57781244ab80c4a965… Patch: https://github.com/kamailio/kamailio/commit/9eeab4396d8ec57781244ab80c4a965… --- diff --git a/src/modules/jansson/doc/jansson_admin.xml b/src/modules/jansson/doc/jansson_admin.xml index debc9cc5a19..daa5e9ea51e 100644 --- a/src/modules/jansson/doc/jansson_admin.xml +++ b/src/modules/jansson/doc/jansson_admin.xml @@ -56,10 +56,16 @@ <title>Functions</title> <section id="jansson.f.jansson_get"> <title> - <function moreinfo="none">jansson_get(key/path, src, dst)</function> + <function moreinfo="none">jansson_get(path, src, dst)</function> </title> <para> - Copy the value at the location 'path' from the json object 'src' and store it in pvar 'dst'. + Copy the value at the location 'path' from the json object 'src' + and store it in variable 'dst'. The path can also be a simple field name + (a key), if it does not include any path separator. To retrieve the + value of a field that includes path separators in the name, use + jansson_get_field(). + </para> + <para> The 'src' can be a static string or a dynamic string with variables. </para> <para> @@ -71,7 +77,7 @@ </para> <para> The function can put a string, integer, null, or new json string into destination. - If the key/path can't be found in the JSON data structure, the pvar is not changed. + If the path can't be found in the JSON data structure, the pvar is not changed. If it had a previous value, that value remains unchanged. </para> @@ -280,22 +286,27 @@ jansson_xencode("a", "$var(js)"); </section> <section id="jansson.f.jansson_get_field"> <title> - <function moreinfo="none">jansson_get_field(src, field_name, dst)</function> + <function moreinfo="none">jansson_get_field(field_name, src, dst)</function> </title> <para> - Copy field 'field_name' from json object 'src' and store it in pvar 'dst'. + Copy the value of the field 'field_name' from json object 'src' + and store it in pvar 'dst'. The field name is not evaluated as JSON + path, therefore it has a different behaviour than jansson_get() and + can be used when the field name contains path delimiters. </para> <para> - <emphasis>This function is deprecated</emphasis> but kept for backwards compatibility. - Right now it is just a wrapper around <function>jansson_get</function>, and its - functionality is the same. + Note that till version 5.7.x, this function was similar to jansson_get(), + after that its behaviour changed to work as described above. Also, + the order of parameters changed. </para> <example> <title><function>jansson_get_field</function> usage</title> <programlisting format="linespecific"> ... -jansson_get_field("{'foo':'bar'}", "foo", "$var(foo)"); +jansson_get_field("foo", "{'foo':'bar'}", "$var(foo)"); xlog("foo is $var(foo)"); +jansson_get_field("foo.foz", "{'foo.foz':'bar.buz'}", "$var(foofoz)"); +xlog("foo.foz is $var(foofoz)"); ... </programlisting> </example>

1 0

git:master:d7b76608: jansson: use key as field name for jansson_get_field()
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: d7b76608595046001cab3ced06d29c1e9a84cb99 URL: https://github.com/kamailio/kamailio/commit/d7b76608595046001cab3ced06d29c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:40+01:00 jansson: use key as field name for jansson_get_field() - do no try to evaluate it as json path --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d7b76608595046001cab3ced06d29c1… Patch: https://github.com/kamailio/kamailio/commit/d7b76608595046001cab3ced06d29c1… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 8e154e7bff4..58a698446ca 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -34,7 +34,7 @@ #include "jansson_utils.h" int janssonmod_get_helper( - sip_msg_t *msg, str *path_s, str *src_s, pv_spec_t *dst_pv) + sip_msg_t *msg, str *path_s, int pmode, str *src_s, pv_spec_t *dst_pv) { char c; pv_value_t dst_val; @@ -52,7 +52,7 @@ int janssonmod_get_helper( char *path = path_s->s; - json_t *v = json_path_get(json, path, 0); + json_t *v = json_path_get(json, path, pmode); if(!v) { goto fail; } @@ -91,7 +91,26 @@ int janssonmod_get(struct sip_msg *msg, char *path_in, char *src_in, char *dst) return -1; } - return janssonmod_get_helper(msg, &path_s, &src_s, (pv_spec_t *)dst); + return janssonmod_get_helper(msg, &path_s, 0, &src_s, (pv_spec_t *)dst); +} + +int janssonmod_get_field( + struct sip_msg *msg, char *path_in, char *src_in, char *dst) +{ + str src_s; + str path_s; + + if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { + ERR("cannot get json string value\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)path_in, &path_s) != 0) { + ERR("cannot get path string value\n"); + return -1; + } + + return janssonmod_get_helper(msg, &path_s, 1, &src_s, (pv_spec_t *)dst); } int janssonmod_pv_get( @@ -111,7 +130,7 @@ int janssonmod_pv_get( return -1; } - ret = janssonmod_get_helper(msg, &path_s, &val.rs, (pv_spec_t *)dst); + ret = janssonmod_get_helper(msg, &path_s, 0, &val.rs, (pv_spec_t *)dst); pv_value_destroy(&val); diff --git a/src/modules/jansson/jansson_funcs.h b/src/modules/jansson/jansson_funcs.h index f59074a210b..ab1c029821f 100644 --- a/src/modules/jansson/jansson_funcs.h +++ b/src/modules/jansson/jansson_funcs.h @@ -27,6 +27,8 @@ int janssonmod_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); +int janssonmod_get_field( + struct sip_msg *msg, char *path_in, char *src_in, char *dst); int janssonmod_pv_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, @@ -34,7 +36,7 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, int janssonmod_array_size( struct sip_msg *msg, char *json_in, char *path_in, char *dst); int janssonmod_get_helper( - sip_msg_t *msg, str *path_s, str *src_s, pv_spec_t *dst_pv); + sip_msg_t *msg, str *path_s, int pmode, str *src_s, pv_spec_t *dst_pv); int jansson_xdecode(struct sip_msg *msg, char *src_in, char *xavp_in); int jansson_xencode(struct sip_msg *msg, char *xavp, char *dst); diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index 816cb130fa9..e7dd58ee3fc 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -55,11 +55,6 @@ int janssonmod_set_append(struct sip_msg *msg, char *type_in, char *path_in, { return janssonmod_set(1, msg, type_in, path_in, value_in, result); } -int janssonmod_get_field( - struct sip_msg *msg, char *jansson_in, char *path_in, char *result) -{ - return janssonmod_get(msg, path_in, jansson_in, result); -} /* clang-format off */ /* Exported functions */ @@ -246,7 +241,7 @@ static int ki_jansson_get(sip_msg_t *msg, str *spath, str *sdoc, str *spv) return -1; } - return janssonmod_get_helper(msg, spath, sdoc, pvs); + return janssonmod_get_helper(msg, spath, 0, sdoc, pvs); } /**

1 0

git:master:525dc452: jansson: reformat exported structures
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 525dc4523ac411e1154c3ae8af1ec6f8678d1dbc URL: https://github.com/kamailio/kamailio/commit/525dc4523ac411e1154c3ae8af1ec6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:40+01:00 jansson: reformat exported structures --- Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/525dc4523ac411e1154c3ae8af1ec6f… Patch: https://github.com/kamailio/kamailio/commit/525dc4523ac411e1154c3ae8af1ec6f… --- diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index 820a5492574..816cb130fa9 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -61,42 +61,44 @@ int janssonmod_get_field( return janssonmod_get(msg, path_in, jansson_in, result); } +/* clang-format off */ /* Exported functions */ static cmd_export_t cmds[] = { - {"jansson_get", (cmd_function)janssonmod_get, 3, fixup_get_params, - fixup_get_params_free, ANY_ROUTE}, - {"jansson_pv_get", (cmd_function)janssonmod_pv_get, 3, - fixup_pv_get_params, fixup_pv_get_params_free, ANY_ROUTE}, - {"jansson_array_size", (cmd_function)janssonmod_array_size, 3, - fixup_get_params, fixup_get_params_free, ANY_ROUTE}, - {"jansson_set", (cmd_function)janssonmod_set_replace, 4, - fixup_set_params, fixup_set_params_free, ANY_ROUTE}, - {"jansson_append", (cmd_function)janssonmod_set_append, 4, - fixup_set_params, fixup_set_params_free, ANY_ROUTE}, - {"jansson_xdecode", (cmd_function)jansson_xdecode, 2, fixup_spve_spve, - fixup_free_spve_spve, ANY_ROUTE}, - {"jansson_xencode", (cmd_function)jansson_xencode, 2, fixup_xencode, - fixup_xencode_free, ANY_ROUTE}, - /* for backwards compatibility */ - {"jansson_get_field", (cmd_function)janssonmod_get_field, 3, - fixup_get_params, fixup_get_params_free, ANY_ROUTE}, - /* non-script functions */ - {"jansson_to_val", (cmd_function)jansson_to_val, 0, 0, 0, 0}, - - {0, 0, 0, 0, 0, 0}}; + {"jansson_get", (cmd_function)janssonmod_get, 3, fixup_get_params, + fixup_get_params_free, ANY_ROUTE}, + {"jansson_pv_get", (cmd_function)janssonmod_pv_get, 3, + fixup_pv_get_params, fixup_pv_get_params_free, ANY_ROUTE}, + {"jansson_array_size", (cmd_function)janssonmod_array_size, 3, + fixup_get_params, fixup_get_params_free, ANY_ROUTE}, + {"jansson_set", (cmd_function)janssonmod_set_replace, 4, + fixup_set_params, fixup_set_params_free, ANY_ROUTE}, + {"jansson_append", (cmd_function)janssonmod_set_append, 4, + fixup_set_params, fixup_set_params_free, ANY_ROUTE}, + {"jansson_xdecode", (cmd_function)jansson_xdecode, 2, fixup_spve_spve, + fixup_free_spve_spve, ANY_ROUTE}, + {"jansson_xencode", (cmd_function)jansson_xencode, 2, fixup_xencode, + fixup_xencode_free, ANY_ROUTE}, + {"jansson_get_field", (cmd_function)janssonmod_get_field, 3, + fixup_get_params, fixup_get_params_free, ANY_ROUTE}, + /* non-script functions */ + {"jansson_to_val", (cmd_function)jansson_to_val, 0, 0, 0, 0}, + + {0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "jansson", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - 0, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "jansson", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + 0, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format off */ static int fixup_get_params(void **param, int param_no)

1 0

git:master:48034ab6: jansson: added path evaluatian mode for helper functions
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 48034ab61482f6b3d9e77ccfc9e0743c44ff4458 URL: https://github.com/kamailio/kamailio/commit/48034ab61482f6b3d9e77ccfc9e0743… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:40+01:00 jansson: added path evaluatian mode for helper functions --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_path.c Modified: src/modules/jansson/jansson_path.h --- Diff: https://github.com/kamailio/kamailio/commit/48034ab61482f6b3d9e77ccfc9e0743… Patch: https://github.com/kamailio/kamailio/commit/48034ab61482f6b3d9e77ccfc9e0743… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 926ed34c266..8e154e7bff4 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -52,7 +52,7 @@ int janssonmod_get_helper( char *path = path_s->s; - json_t *v = json_path_get(json, path); + json_t *v = json_path_get(json, path, 0); if(!v) { goto fail; } @@ -252,7 +252,7 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, goto fail; } - if(json_path_set(result_json, path, value, append) < 0) { + if(json_path_set(result_json, path, 0, value, append) < 0) { goto fail; } @@ -307,7 +307,7 @@ int janssonmod_array_size( char *path = path_s.s; - json_t *v = json_path_get(json, path); + json_t *v = json_path_get(json, path, 0); if(!v) { ERR("failed to find %s in json\n", path); goto fail; diff --git a/src/modules/jansson/jansson_path.c b/src/modules/jansson/jansson_path.c index cc38c380260..d4148591aac 100644 --- a/src/modules/jansson/jansson_path.c +++ b/src/modules/jansson/jansson_path.c @@ -25,7 +25,7 @@ static char *jsonp_strdup(const char *str); static json_malloc_t do_malloc = malloc; static json_free_t do_free = free; -json_t *json_path_get(const json_t *json, const char *path) +json_t *json_path_get(const json_t *json, const char *path, const int pmode) { static const char array_open = '['; static const char *path_delims = ".[", *array_close = "]"; @@ -50,7 +50,11 @@ json_t *json_path_get(const json_t *json, const char *path) while(peek && *peek && cursor) { char *last_peek = peek; - peek = strpbrk(peek, expect); + if(pmode == 0) { + peek = strpbrk(peek, expect); + } else { + peek = NULL; + } if(peek) { if(!token && peek != last_peek) goto fail; @@ -85,8 +89,8 @@ json_t *json_path_get(const json_t *json, const char *path) return NULL; } -int json_path_set( - json_t *json, const char *path, json_t *value, unsigned int append) +int json_path_set(json_t *json, const char *path, const int pmode, + json_t *value, unsigned int append) { static const char array_open = '['; static const char object_delim = '.'; @@ -117,8 +121,11 @@ int json_path_set( while(peek && *peek && cursor) { char *last_peek = peek; - peek = strpbrk(last_peek, expect); - + if(pmode == 0) { + peek = strpbrk(last_peek, expect); + } else { + peek = NULL; + } if(peek) { if(!token && peek != last_peek) { ERR("unexpected trailing chars in JSON path at pos %zu\n", diff --git a/src/modules/jansson/jansson_path.h b/src/modules/jansson/jansson_path.h index 79e1614c6fd..22fc562fee7 100644 --- a/src/modules/jansson/jansson_path.h +++ b/src/modules/jansson/jansson_path.h @@ -10,8 +10,8 @@ #define _JANSSON_PATH_H_ #include <jansson.h> -json_t *json_path_get(const json_t *json, const char *path); -int json_path_set( - json_t *json, const char *path, json_t *value, unsigned int append); +json_t *json_path_get(const json_t *json, const char *path, const int pmode); +int json_path_set(json_t *json, const char *path, const int pmode, + json_t *value, unsigned int append); #endif

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev