sr-dev October 2024

sr-dev@lists.kamailio.org

14 participants
110 discussions

git:master:e802f918: core: parser sdp - check field length when extracting the value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e802f9187383feb7fdd96c4ded44fda403da4535 URL: https://github.com/kamailio/kamailio/commit/e802f9187383feb7fdd96c4ded44fda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-11T12:37:08+02:00 core: parser sdp - check field length when extracting the value --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/e802f9187383feb7fdd96c4ded44fda… Patch: https://github.com/kamailio/kamailio/commit/e802f9187383feb7fdd96c4ded44fda… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index a5186fb4428..079a9992402 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -346,13 +346,16 @@ int extract_candidate(str *body, sdp_stream_cell_t *stream) } -/* generic method for attribute extraction +/* generic method for attribute value extraction * field must has format "a=attrname:" */ int extract_field(str *body, str *value, str field) { - if(strncmp(body->s, field.s, field.len < body->len ? field.len : body->len) - != 0) { - /*LM_DBG("We are not pointing to an %.* attribute =>`%.*s'\n", field.len, field.s, body->len, body->s); */ + if(body->len < field.len) { + return -1; + } + if(strncmp(body->s, field.s, field.len) != 0) { + /* LM_DBG("We are not pointing to an %.* attribute =>`%.*s'\n", + field.len, field.s, body->len, body->s); */ return -1; }

1 month, 2 weeks

git:master:d4bbde61: core: parse sdp - check for body limit on mixed content

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d4bbde619bbf808edebb31e131b3783ba2a4b34d URL: https://github.com/kamailio/kamailio/commit/d4bbde619bbf808edebb31e131b3783… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-11T12:00:53+02:00 core: parse sdp - check for body limit on mixed content --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/d4bbde619bbf808edebb31e131b3783… Patch: https://github.com/kamailio/kamailio/commit/d4bbde619bbf808edebb31e131b3783… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 52e967a3db9..06fc411f502 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -810,9 +810,11 @@ static int parse_mixed_content(str *mixed_body, str delimiter, sdp_info_t *_sdp) } /* end of while */ /* and now we need to parse the content */ if(start_parsing) { - while(('\n' == *rest) || ('\r' == *rest) || ('\t' == *rest) - || (' ' == *rest)) + while((rest < bodylimit) + && (('\n' == *rest) || ('\r' == *rest) || ('\t' == *rest) + || (' ' == *rest))) { rest++; /* Skip any whitespace */ + } _sdp->raw_sdp.s = rest; _sdp->raw_sdp.len = d2p - rest; /* LM_DBG("we need to check session %d: <%.*s>\n", session_num, _sdp.raw_sdp.len, _sdp.raw_sdp.s); */

1 month, 2 weeks

git:master:fc481706: core: parser sdp - check for length of sendrecv attribute

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fc4817064f81ef9a82b1b1468b1b8a4ae352c1f2 URL: https://github.com/kamailio/kamailio/commit/fc4817064f81ef9a82b1b1468b1b8a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-11T11:41:02+02:00 core: parser sdp - check for length of sendrecv attribute --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/fc4817064f81ef9a82b1b1468b1b8a4… Patch: https://github.com/kamailio/kamailio/commit/fc4817064f81ef9a82b1b1468b1b8a4… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index a5dffd9c398..a5186fb4428 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -447,6 +447,9 @@ int extract_sendrecv_mode(str *body, str *sendrecv_mode, int *is_on_hold) { char *cp1; + if(body->len < 10) { + return -1; + } cp1 = body->s; if(!((strncasecmp(cp1, "a=sendrecv", 10) == 0) || (strncasecmp(cp1, "a=recvonly", 10) == 0))) {

1 month, 2 weeks

Inconsistencies in SIP Parsing with Embedded tel: URIs and Documentation Issues

by Xenofon Karamanos

Hi all, I’d like to bring up some development topics related to the SIP parsing logic, specifically when handling sip: with embedded tel URIs scheme. The current behaviour, particularly when user=phone is present, is leading to some inconsistencies and potential confusion, and I believe it might require some refactoring or documentation updates. Current Parsing Behavior: When a tel: URI is embedded in a sip: scheme (e.g., user=phone is present), the parser currently copies the URI parsed parameters to sip_params, then splits the user part (like 123;param=value;param2=value2) into user and all the rest tel parameters to params. This behaviour is only triggered when the global phone2tel configuration option is enabled (which is the default). Issues: 1. Inconsistent Handling of URI Parameters There’s no consistency across modules on whether they use sip_params or params to get the URI parameters. While most modules correctly use sip_params, others use params. Normally, this works fine because sip_params and params hold the same data when user=phone is not present or phone2tel is disabled. However, when user=phone is present and phone2tel is enabled, params may be empty, leading to unexpected behavior in modules relying on it. For example, the following modules are using params and many others: * dmqnode.c (line 204)<https://github.com/kamailio/kamailio/blob/ba6ab04e06b0dfd66874749e0cb1225f2…> * notification_peer.c (line 432)<https://github.com/kamailio/kamailio/blob/ba6ab04e06b0dfd66874749e0cb1225f2…> While some may handle the differences between sip_params and params, not all of them do. 2. Unclear Intention of the phone2tel Global Parameter The current parser code is quite old, and it’s unclear what the original intention behind the phone2tel global parameter was. As far as I understand, the sip: scheme can handle tel: URIs, and this is the most widely accepted specification. The role of phone2tel seems to blur the lines between the two schemes, leading to unexpected transformations. Example of Unexpected Behavior: Consider the following header: P-Asserted-Identity: Display <sip:+1234;pname=pval@domain;user=phone>;tag=1234 If we apply the {tobody.user} transformation, the expected output should be the user part of the URI. Based on the RFC, we expected the transformation to return +1234;pname=pval. However, due to the phone2tel global configuration parameter, the parser treats it as a tel: scheme and returns only +1234. This behavior seems to be influenced by how the global parameter forces the parser to handle the URI. Proposal: To resolve these issues, I suggest the following: 1. Refactor Parameter Handling: Introduce a more explicit separation of tel_params and sip_params, and ensure all modules use the correct set of parameters based on the context. This would help enforce consistency across the codebase. 2. Update Documentation: Provide clear documentation regarding the behavior of phone2tel and how it impacts URI parsing. In particular, the transformation documentation should reflect the expected behavior depending on whether the URI is treated as sip: or tel:. 3. Review and Fix Modules: We should audit the modules that currently rely on params and ensure they are using sip_params where appropriate, especially in cases where user=phone could be present. Any guidance or feedback on these points would be greatly appreciated. If you’ve encountered any related bugs or discovered other edge cases, please let me know so we can address them. Best regards, Xenofon

1 month, 2 weeks

git:master:95fb987b: modules: readme files regenerated - siptrace ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 95fb987bd402432996c616c6582ef430e9441d93 URL: https://github.com/kamailio/kamailio/commit/95fb987bd402432996c616c6582ef43… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-10-11T11:16:09+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/95fb987bd402432996c616c6582ef43… Patch: https://github.com/kamailio/kamailio/commit/95fb987bd402432996c616c6582ef43…

1 month, 2 weeks

git:master:337c06b6: siptrace: docs for data_mode param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 337c06b6b43606536f1d37ebfd6e4240aab9cf5a URL: https://github.com/kamailio/kamailio/commit/337c06b6b43606536f1d37ebfd6e424… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-11T11:02:35+02:00 siptrace: docs for data_mode param --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/337c06b6b43606536f1d37ebfd6e424… Patch: https://github.com/kamailio/kamailio/commit/337c06b6b43606536f1d37ebfd6e424… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 2bf7c1e9163..b7fd0bf3c74 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -610,6 +610,26 @@ modparam("siptrace", "trace_mode", 1) ... modparam("siptrace", "trace_mode", 3) ... +</programlisting> + </example> + </section> + <section id="siptrace.p.data_mode"> + <title><varname>data_mode</varname> (integer)</title> + <para> + A set of flags to control what data is used for the trace. + If flag 1 (value 1) is set, then advertised address (when set) + is used instead of socket bind address. + </para> + <para> + Default value is <emphasis>0</emphasis>. + </para> + <example> + <title>Set <varname>data_mode</varname> + parameter</title> + <programlisting format="linespecific"> +... +modparam("siptrace", "data_mode", 1) +... </programlisting> </example> </section> @@ -949,4 +969,3 @@ onsend_route { </section> </chapter> -

1 month, 2 weeks

git:master:9d8432f3: siptrace: added parameter data_mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9d8432f3ffb1f9d07874452e23140be21e75c530 URL: https://github.com/kamailio/kamailio/commit/9d8432f3ffb1f9d07874452e23140be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-11T10:57:05+02:00 siptrace: added parameter data_mode - control if bind address of advertised address are used --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/9d8432f3ffb1f9d07874452e23140be… Patch: https://github.com/kamailio/kamailio/commit/9d8432f3ffb1f9d07874452e23140be… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 31609821682..257cf0eb335 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -133,6 +133,9 @@ int siptrace_net_data_sent(sr_event_param_t *evp); static int _siptrace_init_mode = 0; static int _siptrace_mode = 0; +#define SIPTRACE_DATA_MODE_ADVADDR 1 /* use advertised address */ +static int _siptrace_data_mode = 0; + static str db_url = str_init(DEFAULT_DB_URL); static str siptrace_table = str_init("sip_trace"); @@ -272,6 +275,7 @@ static param_export_t params[] = { {"trace_db_mode", INT_PARAM, &trace_db_mode}, {"trace_init_mode", PARAM_INT, &_siptrace_init_mode}, {"trace_mode", PARAM_INT, &_siptrace_mode}, + {"data_mode", PARAM_INT, &_siptrace_data_mode}, {"evcb_msg", PARAM_STR, &_siptrace_evcb_msg}, {"trace_dialog_ack", PARAM_INT, &trace_dialog_ack}, {"trace_dialog_spiral", PARAM_INT, &trace_dialog_spiral}, @@ -2308,7 +2312,8 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.fromip.s = sto.fromip_buff; } - if(nd->rcv->bind_address != NULL + if((_siptrace_data_mode & SIPTRACE_DATA_MODE_ADVADDR) + && nd->rcv->bind_address != NULL && nd->rcv->bind_address->useinfo.sock_str.len > 0 && (nd->rcv->bind_address->useinfo.sock_str.len < SIPTRACE_ADDR_MAX - 1)) { @@ -2449,7 +2454,8 @@ int siptrace_net_data_sent(sr_event_param_t *evp) sto.fromip.len = SIPTRACE_ANYADDR_LEN; proto = PROTO_UDP; } else { - if(new_dst.send_sock->useinfo.sock_str.len > 0) { + if((_siptrace_data_mode & SIPTRACE_DATA_MODE_ADVADDR) + && new_dst.send_sock->useinfo.sock_str.len > 0) { vsock = new_dst.send_sock->useinfo.sock_str; } else { vsock = new_dst.send_sock->sock_str;

1 month, 2 weeks

[kamailio/kamailio] topos:added get_callid_mask/get_callid_unmask funtion for handeling Refer-To header (PR #3872)

by Harish S

Topos: Added get_callid_mask functin which will give the masked callID if actual callID is given and get_callid_unmask function which will unmask the given call-ID. This funtion is useful when the client sends a refer methord with refer-to header containing call-id  #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3872 -- Commit Summary -- * add funtion to mask/unmask callID * get_callid_mask /get_callid_unmask Document Update -- File Changes -- M src/modules/topos/doc/topos_admin.xml (87) M src/modules/topos/topos_mod.c (183) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3872.patch https://github.com/kamailio/kamailio/pull/3872.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3872 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3872(a)github.com>

1 month, 2 weeks

git:master:9fb15e2e: siptrace: use advertise address if set for trace mode 1 callbacks

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9fb15e2ef93a0d606fa4c6d695a2f13a4b0a8031 URL: https://github.com/kamailio/kamailio/commit/9fb15e2ef93a0d606fa4c6d695a2f13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-09T19:51:27+02:00 siptrace: use advertise address if set for trace mode 1 callbacks --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/9fb15e2ef93a0d606fa4c6d695a2f13… Patch: https://github.com/kamailio/kamailio/commit/9fb15e2ef93a0d606fa4c6d695a2f13… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 208718adf0d..31609821682 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2308,15 +2308,26 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.fromip.s = sto.fromip_buff; } - sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", - siptrace_proto_name(nd->rcv->proto), ip_addr2strz(&nd->rcv->dst_ip), - (int)nd->rcv->dst_port); - if(sto.toip.len < 0 || sto.toip.len >= SIPTRACE_ADDR_MAX) { - LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); - sto.toip.s = SIPTRACE_ANYADDR; - sto.toip.len = SIPTRACE_ANYADDR_LEN; - } else { + if(nd->rcv->bind_address != NULL + && nd->rcv->bind_address->useinfo.sock_str.len > 0 + && (nd->rcv->bind_address->useinfo.sock_str.len + < SIPTRACE_ADDR_MAX - 1)) { + sto.toip.len = nd->rcv->bind_address->useinfo.sock_str.len; + memcpy(sto.toip_buff, nd->rcv->bind_address->useinfo.sock_str.s, + sto.toip.len); + sto.toip_buff[sto.toip.len] = '\0'; sto.toip.s = sto.toip_buff; + } else { + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(nd->rcv->proto), + ip_addr2strz(&nd->rcv->dst_ip), (int)nd->rcv->dst_port); + if(sto.toip.len < 0 || sto.toip.len >= SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } } sto.dir = "in"; @@ -2408,6 +2419,7 @@ int siptrace_net_data_sent(sr_event_param_t *evp) int proto; int evcb_ret; int ret = 0; + str vsock; if(evp->data == 0) return -1; @@ -2437,14 +2449,18 @@ int siptrace_net_data_sent(sr_event_param_t *evp) sto.fromip.len = SIPTRACE_ANYADDR_LEN; proto = PROTO_UDP; } else { - if(new_dst.send_sock->sock_str.len >= SIPTRACE_ADDR_MAX - 1) { - LM_ERR("socket string is too large: %d\n", - new_dst.send_sock->sock_str.len); + if(new_dst.send_sock->useinfo.sock_str.len > 0) { + vsock = new_dst.send_sock->useinfo.sock_str; + } else { + vsock = new_dst.send_sock->sock_str; + } + if(vsock.len >= SIPTRACE_ADDR_MAX - 1) { + LM_ERR("socket string is too large: %d\n", vsock.len); return -1; } - strncpy(sto.fromip_buff, new_dst.send_sock->sock_str.s, - new_dst.send_sock->sock_str.len); - sto.fromip.len = new_dst.send_sock->sock_str.len; + memcpy(sto.fromip_buff, vsock.s, vsock.len); + sto.fromip.len = vsock.len; + sto.fromip_buff[sto.fromip.len] = '\0'; proto = new_dst.send_sock->proto; } sto.fromip.s = sto.fromip_buff;

1 month, 2 weeks

[kamailio/kamailio] goto error on cursor error (PR #3996)

by Adnan Elezovic

#### 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 If the query failed, the result set should not be parsed and used. This results in an empty result set which will most likely lead to unwanted behavior. Background: While troubleshooting, we detected that domain.reload actually replaces domains with an empty result set if mongodb connectivity fails. ``` DEBUG: db_mongodb [mongodb_dbase.c:849]: db_mongodb_store_result(): An error occurred: No suitable servers found (`serverSelectionTryOnce` set): [connection timeout calling ismaster on 'pdb-iop1-wrmg-2:27017'] [connection timeout calling ismaster on 'pdb-iop1-wrmg-1:27017'] DEBUG: domain [domain.c:365]: reload_tables(): number of rows in domain_attrs table: 0 DEBUG: <core> [db_res.c:79]: db_free_columns(): freeing 0 columns DEBUG: <core> [db_res.c:138]: db_free_result(): freeing result set at 0x7fb0c9811848 DEBUG: db_mongodb [mongodb_dbase.c:973]: db_mongodb_query(): query to collection [domains] DEBUG: db_mongodb [mongodb_dbase.c:1007]: db_mongodb_query(): query filter: { } DEBUG: db_mongodb [mongodb_dbase.c:1043]: db_mongodb_query(): columns filter: { "projection" : { "domain" : 1, "did" : 1 } } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3996 -- Commit Summary -- * mongodb: fix cursor error resulting empty result set -- File Changes -- M src/modules/db_mongodb/mongodb_dbase.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3996.patch https://github.com/kamailio/kamailio/pull/3996.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3996 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3996(a)github.com>

1 month, 2 weeks

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2024