sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

git:master:39f20537: modules: readme files regenerated - siputils ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 39f2053769ea45b1d75a0b73f7f7c14397546b4e URL: https://github.com/kamailio/kamailio/commit/39f2053769ea45b1d75a0b73f7f7c14… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-10-15T14:01:10+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/39f2053769ea45b1d75a0b73f7f7c14… Patch: https://github.com/kamailio/kamailio/commit/39f2053769ea45b1d75a0b73f7f7c14… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index f66c7391747..2ab1d707a9a 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -36,6 +36,8 @@ Bogdan-Andrei Iancu Gabriel Vasile +Eik Rentzow + Copyright �� 2008, 2005, 2003 1&1 Internet AG, FhG Fokus, Voice Sistem SRL __________________________________________________________________ @@ -116,6 +118,7 @@ Gabriel Vasile 5.3. $pcv(genaddr) 5.4. $pcv(orig) 5.5. $pcv(term) + 5.6. $pcv(status) List of Examples @@ -249,6 +252,7 @@ Chapter 1. Admin Guide 5.3. $pcv(genaddr) 5.4. $pcv(orig) 5.5. $pcv(term) + 5.6. $pcv(status) 1. Overview @@ -1089,7 +1093,19 @@ if(is_first_hop("1")) { ... } 4.37. sip_p_charging_vector(flags) Manage the P-Charging-Vector header (RFC7315). The flags can be: 'r' - - remove; 'g' - generate; 'f' - force (remove + generate). + remove; 'g' - generate; 'f' - force (remove + generate). Once a new PCV + has been generated by 'g' or 'f' the PCV cannot be changed again. The + icid-generated-at parameter of a generated PCV will be set to the + sending interface.IP address. + + Return Codes: + * 1 - Nothing was done. + * (2 - intentionally left out) + * 3 - P-Charging-Vector header has been newly generated. + * 4 - P-Charging-Vector header has been deleted. + * 5 - P-Charging-Vector header has been replaced or inserted after + deletion. + * negative - Any error occured during execution. This function can be used from ANY_ROUTE. @@ -1227,6 +1243,7 @@ if (sip_parse_headers()) { 5.3. $pcv(genaddr) 5.4. $pcv(orig) 5.5. $pcv(term) + 5.6. $pcv(status) 5.1. $pcv(all) @@ -1247,3 +1264,16 @@ if (sip_parse_headers()) { 5.5. $pcv(term) term-ioi field (see RFC7315 section 5.6) + +5.6. $pcv(status) + + Returns whether the PCV header was successfully parsed, deleted, newly + generated or other. + * 0 - No P-Charging-Vector header in message. + * 1 - P-Charging-Vector header in message and parsed successfully. + * 2 - P-Charging-Vector is present, but has no valid icid-value + parameter. + * 3 - P-Charging-Vector header has been newly generated or replaced. + * 4 - P-Charging-Vector header has been deleted. + + Negative values indicate an internal error during the parsing process.

2 months, 4 weeks

git:master:05a30ed5: siputils/doc: updated pcv documentation [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 05a30ed53fc5657a2d86e1c1bdb9277571a8d17e URL: https://github.com/kamailio/kamailio/commit/05a30ed53fc5657a2d86e1c1bdb9277… Author: Eik Rentzow <rentzow(a)gmx.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-15T13:48:35+02:00 siputils/doc: updated pcv documentation [skip ci] - Updated documentation to reflect the changes to the $pcv pseudo-var and the sip_p_charging_vector() function. --- Modified: src/modules/siputils/doc/siputils.xml Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/05a30ed53fc5657a2d86e1c1bdb9277… Patch: https://github.com/kamailio/kamailio/commit/05a30ed53fc5657a2d86e1c1bdb9277… --- diff --git a/src/modules/siputils/doc/siputils.xml b/src/modules/siputils/doc/siputils.xml index d537da1fb15..08d3d8fb4d9 100644 --- a/src/modules/siputils/doc/siputils.xml +++ b/src/modules/siputils/doc/siputils.xml @@ -95,6 +95,14 @@ </address> </editor> + <editor> + <firstname>Eik</firstname> + <surname>Rentzow</surname> + <address> + <email>rentzow(a)gmx.de</email> + </address> + </editor> + </authorgroup> <copyright> <year>2008</year> diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 6850f53e9bf..e92472284df 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1279,7 +1279,33 @@ if(is_first_hop("1")) { ... } <para> Manage the P-Charging-Vector header (RFC7315). The flags can be: 'r' - remove; 'g' - generate; 'f' - force (remove + generate). + Once a new PCV has been generated by 'g' or 'f' the PCV cannot be changed again. + The icid-generated-at parameter of a generated PCV will be set to + the sending interface.IP address. </para> + <para> + Return Codes: + </para> + <itemizedlist> + <listitem><para> + <emphasis>1</emphasis> - Nothing was done. + </para></listitem> + <listitem><para> + <emphasis>(2</emphasis> - <emphasis>intentionally left out)</emphasis> + </para></listitem> + <listitem><para> + <emphasis>3</emphasis> - P-Charging-Vector header has been newly generated. + </para></listitem> + <listitem><para> + <emphasis>4</emphasis> - P-Charging-Vector header has been deleted. + </para></listitem> + <listitem><para> + <emphasis>5</emphasis> - P-Charging-Vector header has been replaced or inserted after deletion. + </para></listitem> + <listitem><para> + <emphasis>negative</emphasis> - Any error occured during execution. + </para></listitem> + </itemizedlist> <para> This function can be used from ANY_ROUTE. </para> @@ -1532,6 +1558,32 @@ if (sip_parse_headers()) { term-ioi field (see RFC7315 section 5.6) </para> </section> + <section id="siputils.v.pcv_status"> + <title><varname>$pcv(status)</varname></title> + <para> + Returns whether the PCV header was successfully parsed, deleted, + newly generated or other. + <itemizedlist> + <listitem><para> + <emphasis>0</emphasis> - No P-Charging-Vector header in message. + </para></listitem> + <listitem><para> + <emphasis>1</emphasis> - P-Charging-Vector header in message and parsed successfully. + </para></listitem> + <listitem><para> + <emphasis>2</emphasis> - P-Charging-Vector is present, but has no valid + <emphasis>icid-value</emphasis> parameter. + </para></listitem> + <listitem><para> + <emphasis>3</emphasis> - P-Charging-Vector header has been newly generated or replaced. + </para></listitem> + <listitem><para> + <emphasis>4</emphasis> - P-Charging-Vector header has been deleted. + </para></listitem> + </itemizedlist> + Negative values indicate an internal error during the parsing process. + </para> + </section> </section> </chapter>

2 months, 4 weeks

git:master:d7c8bc5c: siputils: bug fix for sip_p_charging_vector

by Victor Seva

Module: kamailio Branch: master Commit: d7c8bc5c58f672004894733d0e6d2a7cb00efe7a URL: https://github.com/kamailio/kamailio/commit/d7c8bc5c58f672004894733d0e6d2a7… Author: Eik Rentzow <rentzow(a)gmx.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-15T13:48:35+02:00 siputils: bug fix for sip_p_charging_vector - Bug fix for #3929 and further improvements. - New buffer usage for P-Charging-Vector handling. - Added $pcv(status) pseudo-var. - Added return values for sip_p_charging_vector(). - Much improved error case handling. - Use send interface for icid-genearted-at: The icid-generated-at parameter should carry the ip adress of the egress interface and not of the interface where the message was received. This is in accordance with other SBC solutions. --- Modified: src/modules/siputils/chargingvector.c --- Diff: https://github.com/kamailio/kamailio/commit/d7c8bc5c58f672004894733d0e6d2a7… Patch: https://github.com/kamailio/kamailio/commit/d7c8bc5c58f672004894733d0e6d2a7…

2 months, 4 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); */

3 months

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

3 months

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

3 months

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

3 months

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…

3 months

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;

3 months

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

3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev