sr-dev March 2022

sr-dev@lists.kamailio.org

10 participants
243 discussions

git:master:70c38551: textops: remove_hf_match() returns true when a header is removed

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 70c385518829d07b2061678af4e2d7f21587e454 URL: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:21:48+01:00 textops: remove_hf_match() returns true when a header is removed --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… Patch: https://github.com/kamailio/kamailio/commit/70c385518829d07b2061678af4e2d7f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index e47e7b65d1..e4de8600d2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -2243,7 +2243,7 @@ static int ki_remove_hf_match(sip_msg_t* msg, str* hname, str *op, str *expr) regex_t mre; regmatch_t pmatch; char c; - int ret = -1; + int ret = -2; memset(&mre, 0, sizeof(regex_t)); @@ -2330,9 +2330,6 @@ static int ki_remove_hf_match(sip_msg_t* msg, str* hname, str *op, str *expr) ret = 1; } } - if(ret==-1) { - ret = 2; - } done: if(vop==4) {

2 years, 8 months

git:master:5c59e96a: textops: docs for remove_hf_match()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5c59e96a7d0a04bff13bde8be688fae8c4d664d9 URL: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:20:48+01:00 textops: docs for remove_hf_match() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… Patch: https://github.com/kamailio/kamailio/commit/5c59e96a7d0a04bff13bde8be688fae… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 2a166f37a9..9805aac6aa 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1541,6 +1541,50 @@ remove_hf_idx("X-My-Header", "-1"); </example> </section> + <section id="textops.f.remove_hf_match"> + <title> + <function moreinfo="none">remove_hf_match(hname, op, expr)</function> + </title> + <para> + Remove from message all headers with name 'hname' matching the body + with expression <quote>expr</quote>, based on operator + <quote>op</quote>. + </para> + <para> + Returns true if at least one header is found and removed. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>hanem</emphasis> - name of the header. + </para> + </listitem> + <listitem> + <para><emphasis>op</emphasis> - operator - it can be: 'eq' - equal; + 'ne' - not equal; 'in' - include; 're' - regular expression match. + </para> + </listitem> + <listitem> + <para><emphasis>expr</emphasis> - expression to match. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>remove_hf_match</function> usage</title> + <programlisting format="linespecific"> +... +if(remove_hf_match("X-Info", "in", "^data")) { + # all headers with name "X-Info" that have the body matching regular + # expression "^data" are removed +} +... +</programlisting> + </example> + </section> + <section id="textops.f.has_body"> <title> <function moreinfo="none">has_body()</function>,

2 years, 8 months

git:master:8b24f28e: textops: added remove_hf_match(hname, op, expr)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8b24f28e9949271d993a5f6cf814fe1de2ddbf6d URL: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T13:09:55+01:00 textops: added remove_hf_match(hname, op, expr) - remove headers with name hname that match the body with expr --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1… Patch: https://github.com/kamailio/kamailio/commit/8b24f28e9949271d993a5f6cf814fe1…

2 years, 8 months

git:master:e64a1eb7: textops: reset counter for looping again in remove_hf_idx()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e64a1eb774284a720718878170e198147af67e50 URL: https://github.com/kamailio/kamailio/commit/e64a1eb774284a720718878170e1981… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T11:28:36+01:00 textops: reset counter for looping again in remove_hf_idx() --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/e64a1eb774284a720718878170e1981… Patch: https://github.com/kamailio/kamailio/commit/e64a1eb774284a720718878170e1981… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index bfb5a54941..a3479c06fd 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1845,6 +1845,7 @@ static int ki_remove_hf_idx(sip_msg_t* msg, str* hname, int idx) pos = idx; again: + i = 0; for (hfi=msg->headers; hfi; hfi=hfi->next) { if (hfm.type!=HDR_OTHER_T && hfm.type!=HDR_ERROR_T) { if (hfm.type!=hfi->type) {

2 years, 8 months

[kamailio/kamailio] ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc (PR #3050)

by Kristiyan Peychev

Fix issues where a non-zero terminated string would get passed to `parse_user_data`.   #### 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 - [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/3050 -- Commit Summary -- * ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc -- File Changes -- M src/modules/ims_registrar_scscf/userdata_parser.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3050.patch https://github.com/kamailio/kamailio/pull/3050.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3050 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3050(a)github.com>

2 years, 8 months

[kamailio/kamailio] ims_registrar_scscf: add a new contact state for notifications (PR #3051)

by Kristiyan Peychev

Add the `deregistered` state to IMS_Registrar_events_enum_t, allowing the registrar to distinguish between UE unregsitration, which do not require a notification to be sent, and network-originated deregistration requests.   #### 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/3051 -- Commit Summary -- * ims_registrar_scscf: add a new contact state for notifications -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (5) M src/modules/ims_registrar_scscf/registrar_notify.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3051.patch https://github.com/kamailio/kamailio/pull/3051.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3051 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3051(a)github.com>

2 years, 8 months

git:master:07b19ef0: ims_registrar_scscf: add a new contact state for notifications

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 07b19ef0604a48148f1bb14787516334820e5a3a URL: https://github.com/kamailio/kamailio/commit/07b19ef0604a48148f1bb1478751633… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T10:28:22+01:00 ims_registrar_scscf: add a new contact state for notifications Add the `deregistered` state to IMS_Registrar_events_enum_t, allowing the registrar to distinguish between UE unregsitration, which do not require a notification to be sent, and network-originated deregistration requests. --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/07b19ef0604a48148f1bb1478751633… Patch: https://github.com/kamailio/kamailio/commit/07b19ef0604a48148f1bb1478751633… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index 761b014624..4dd6223431 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -495,6 +495,7 @@ int event_reg(udomain_t* _d, impurecord_t* r_passed, ucontact_t* c_passed, int e //richard: we only use reg unreg expired and refresh case IMS_REGISTRAR_CONTACT_UNREGISTERED: + case IMS_REGISTRAR_CONTACT_DEREGISTERED: case IMS_REGISTRAR_CONTACT_UNREGISTERED_IMPLICIT: case IMS_REGISTRAR_CONTACT_REGISTERED: case IMS_REGISTRAR_CONTACT_REFRESHED: @@ -1967,7 +1968,8 @@ str get_reginfo_partial(impurecord_t *r, ucontact_t *c, int event_type, unsigned if (//richard we only use expired and unregistered (event_type == IMS_REGISTRAR_CONTACT_EXPIRED || - event_type == IMS_REGISTRAR_CONTACT_UNREGISTERED) + event_type == IMS_REGISTRAR_CONTACT_UNREGISTERED || + event_type == IMS_REGISTRAR_CONTACT_DEREGISTERED) ) { //check if impu record has any other active contacts - if not then set this to terminated - if so then keep this active //check if asserted is present in any of the path headers @@ -2011,6 +2013,7 @@ str get_reginfo_partial(impurecord_t *r, ucontact_t *c, int event_type, unsigned event = r_expired; expires = 0; break; + case IMS_REGISTRAR_CONTACT_DEREGISTERED: case IMS_REGISTRAR_CONTACT_UNREGISTERED: state = r_terminated; event = r_unregistered; diff --git a/src/modules/ims_registrar_scscf/registrar_notify.h b/src/modules/ims_registrar_scscf/registrar_notify.h index 6bfc6d3ce3..04d4958488 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.h +++ b/src/modules/ims_registrar_scscf/registrar_notify.h @@ -116,7 +116,8 @@ typedef enum { IMS_REGISTRAR_CONTACT_EXPIRED, /**< A contact has expired and will be removed */ IMS_REGISTRAR_CONTACT_UNREGISTERED, /**< User unregistered with Expires 0 */ IMS_REGISTRAR_CONTACT_UNREGISTERED_IMPLICIT, /**< User unregistered implicitly, ie not via explicit deregister */ - IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE + IMS_REGISTRAR_SUBSEQUENT_SUBSCRIBE, + IMS_REGISTRAR_CONTACT_DEREGISTERED, /**< User's registration was terminated with RTR */ } IMS_Registrar_events_enum_t; extern IMS_Registrar_events_enum_t IMS_Registrar_events;

2 years, 8 months

git:master:0e0bdbf8: ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0e0bdbf83c7f20bf1814fb58232f8c25e29dd94d URL: https://github.com/kamailio/kamailio/commit/0e0bdbf83c7f20bf1814fb58232f8c2… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T10:27:56+01:00 ims_registrar_scscf: use xmlParseMemory instead of xmlParseDoc Fix issues where a non-zero terminated string would get passed to `parse_user_data`. --- Modified: src/modules/ims_registrar_scscf/userdata_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/0e0bdbf83c7f20bf1814fb58232f8c2… Patch: https://github.com/kamailio/kamailio/commit/0e0bdbf83c7f20bf1814fb58232f8c2… --- diff --git a/src/modules/ims_registrar_scscf/userdata_parser.c b/src/modules/ims_registrar_scscf/userdata_parser.c index 4880f0289c..d8b08b5491 100644 --- a/src/modules/ims_registrar_scscf/userdata_parser.c +++ b/src/modules/ims_registrar_scscf/userdata_parser.c @@ -916,7 +916,7 @@ static ims_subscription* parse_ims_subscription(xmlDocPtr doc, xmlNodePtr root) /** * Parses the user data XML and copies data into a new ims_subscription structure. - * @param xml - the input xml (NB must be null terminated) + * @param xml - the input xml * @returns the ims_subscription* on success or NULL on error */ ims_subscription *parse_user_data(str xml) @@ -927,7 +927,7 @@ ims_subscription *parse_user_data(str xml) if (!ctxtInit) parser_init(scscf_user_data_dtd,scscf_user_data_xsd); doc=0; - doc = xmlParseDoc((unsigned char *)xml.s); + doc = xmlParseMemory((unsigned char *)xml.s, xml.len); if (!doc){ LM_ERR("This is not a valid XML <%.*s>\n", xml.len,xml.s); goto error;

2 years, 8 months

[kamailio/kamailio] ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP (PR #3048)

by riccardv

…es over TCP   #### 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 - [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/3048 -- Commit Summary -- * ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP -- File Changes -- M src/modules/ims_ipsec_pcscf/cmd.c (16) M src/modules/ims_ipsec_pcscf/ipsec.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3048.patch https://github.com/kamailio/kamailio/pull/3048.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3048 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3048(a)github.com>

2 years, 8 months

git:master:79bb2b1c: ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 79bb2b1c4e5a446a333d837d4ccb1038303340e5 URL: https://github.com/kamailio/kamailio/commit/79bb2b1c4e5a446a333d837d4ccb103… Author: Rikyz <xxxxxx@xxxxxx> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-11T10:27:26+01:00 ims_ipsec_pcscf: fix sha1 algorithm and tcp connections for SIP Replies over TCP --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/79bb2b1c4e5a446a333d837d4ccb103… Patch: https://github.com/kamailio/kamailio/commit/79bb2b1c4e5a446a333d837d4ccb103… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 82099367ba..f8672a592a 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -846,17 +846,15 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // for Reply get the dest proto from the received request dst_proto = req->rcv.proto; + // for Reply and TCP sends from P-CSCF server port, for Reply and UDP sends from P-CSCF client port + src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; + + // for Reply and TCP sends to UE client port, for Reply and UDP sends to UE server port + dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; + // Check send socket struct socket_info * client_sock = grep_sock_info(via_host.af == AF_INET ? &ipsec_listen_addr : &ipsec_listen_addr6, src_port, dst_proto); - if(client_sock) { - // for Reply and TCP sends from P-CSCF server port, for Reply and UDP sends from P-CSCF client port - src_port = dst_proto == PROTO_TCP ? s->port_ps : s->port_pc; - - // for Reply and TCP sends to UE client port, for Reply and UDP sends to UE server port - dst_port = dst_proto == PROTO_TCP ? s->port_uc : s->port_us; - } - else - { + if(!client_sock) { src_port = s->port_pc; dst_port = s->port_us; } diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index e874abaa34..16dda61b8c 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -184,7 +184,7 @@ int add_sa(struct mnl_socket* nl_sock, const struct ip_addr *src_addr_param, con if(strncasecmp(r_alg.s, "hmac-md5-96", r_alg.len) == 0) { strcpy(l_auth_algo->alg_name,"md5"); } - else if(strncasecmp(r_alg.s, "hmac-sha1-96", r_alg.len) == 0) { + else if(strncasecmp(r_alg.s, "hmac-sha-1-96", r_alg.len) == 0) { strcpy(l_auth_algo->alg_name,"sha1"); } else { // set default algorithm to sha1

2 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2022