sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
387 discussions

git:master:aced7f10: ims_qos: docs for recv_mode parameter

by Daniel-Constantin Mierla

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>

8 months, 2 weeks

git:master:b00190ff: ims_qos: option to use received ip, port and proto from via

by Daniel-Constantin Mierla

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;

8 months, 2 weeks

git:master:9a552096: ims_registrar_pcscf: docs for delete_delay parameter

by Daniel-Constantin Mierla

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>

8 months, 2 weeks

git:master:3b2bffc9: ims_usrloc_scscf: improve contact lookup for an IMPU

by Daniel-Constantin Mierla

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

8 months, 2 weeks

git:master:bc3e758f: ims_registrar_pcscf: option to delay record expiration instead of immediate delete

by Daniel-Constantin Mierla

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…

8 months, 2 weeks

git:master:e49469c0: kamctl: mysql/ims_usrloc_scscf-create.sql - support for larger record_route values

by Daniel-Constantin Mierla

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

8 months, 2 weeks

[kamailio/kamailio] nathelper: Add Max-Forwards to keep-alive (PR #3657)

by Kristian Høgh

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

8 months, 2 weeks

git:master:e1d9bec0: nathelper: add Max-Forwards headers which is mandatory for OPTIONS according to RFC 3261 (GH 3657)

by Henning Westerholt

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;

8 months, 2 weeks