sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
307 discussions

git:master:e41d23e2: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: e41d23e2955ab9e311f4292b6ffe58e4e4a4432b URL: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-23T09:46:23+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… Patch: https://github.com/kamailio/kamailio/commit/e41d23e2955ab9e311f4292b6ffe58e… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index 319e654c50..d5f49f0cbb 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -39,6 +39,8 @@ Daniel-Constantin Mierla 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) List of Examples @@ -52,6 +54,8 @@ Daniel-Constantin Mierla 1.8. pos_body_end() usage 1.9. pos_find_str() usage 1.10. pos_findi_str() usage + 1.11. pos_find_str() usage + 1.12. pos_rfindi_str() usage Chapter 1. Admin Guide @@ -78,6 +82,8 @@ Chapter 1. Admin Guide 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) 1. Overview @@ -132,6 +138,8 @@ modparam("posops", "idx0", -200) 4.7. pos_body_end() 4.8. pos_find_str(idx, val) 4.9. pos_findi_str(idx, val) + 4.10. pos_rfind_str(idx, val) + 4.11. pos_rfindi_str(idx, val) 4.1. pos_append(idx, val) @@ -236,7 +244,9 @@ $var(pos) = pos_body_end(); case of not finding it or error, the return code is negative. If val is at index 0, it returns the value specified by modparam idx0. - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. The val can be a static string or variables. @@ -254,7 +264,9 @@ $var(idx) = pos_find_str("100", "kamailio"); code is negative. If val is at index 0, it returns the value specified by modparam idx0. - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. The val can be a static string or variables. @@ -264,3 +276,43 @@ $var(idx) = pos_find_str("100", "kamailio"); ... $var(idx) = pos_findi_str("100", "kamailio"); ... + +4.10. pos_rfind_str(idx, val) + + Return the last position of the val in message buffer starting at idx + (reverse search). In case of not finding it or error, the return code + is negative. If val is at index 0, it returns the value specified by + modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.11. pos_find_str() usage +... +$var(idx) = pos_rfind_str("100", "kamailio"); +... + +4.11. pos_rfindi_str(idx, val) + + Return the last position of the val (matching case insensitive) in + message buffer starting at idx (reverse search). In case of not finding + it or error, the return code is negative. If val is at index 0, it + returns the value specified by modparam idx0. + + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the + buffer. + + The val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.12. pos_rfindi_str() usage +... +$var(idx) = pos_rfindi_str("100", "kamailio"); +...

1 0

git:master:2cd6f16f: posops: functions for getting the position by reverse search
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 2cd6f16f9a377bf35a6f3f840dbedc5780897736 URL: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:25:43+02:00 posops: functions for getting the position by reverse search --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5… Patch: https://github.com/kamailio/kamailio/commit/2cd6f16f9a377bf35a6f3f840dbedc5…

1 0

git:master:747ed6d1: core: ut - functions for reverse search of str value
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 747ed6d1c9434a90b77fd86c4dae35e447da9185 URL: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:22:21+02:00 core: ut - functions for reverse search of str value --- Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… Patch: https://github.com/kamailio/kamailio/commit/747ed6d1c9434a90b77fd86c4dae35e… --- diff --git a/src/core/ut.c b/src/core/ut.c index 00254eba23..8dde51aaff 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -392,6 +392,49 @@ char *str_casesearch_strz(str *text, char *needlez) return str_casesearch(text, &needle); } +/** + * @brief search for last occurence of needle in text (reverse search) + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_rsearch(str *text, str *needle) +{ + char *p; + + if(text==NULL || text->s==NULL || needle==NULL || needle->s==NULL + || text->len<needle->len) + return NULL; + + for (p = text->s + text->len - needle->len; p >= text->s; p--) { + if (*p == *needle->s && memcmp(p, needle->s, needle->len)==0) { + return p; + } + } + + return NULL; +} + +/** + * @brief case insensitive search for last occurence of needle in text (reverse search) + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_rcasesearch(str *text, str *needle) +{ + int i,j; + for(i=text->len-needle->len;i>=0;i--) { + for(j=0;j<needle->len;j++) { + if ( !((text->s[i+j]==needle->s[j]) || + ( isalpha((int)text->s[i+j]) + && ((text->s[i+j])^(needle->s[j]))==0x20 )) ) + break; + } + if (j==needle->len) + return text->s+i; + } + return NULL; +} + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or diff --git a/src/core/ut.h b/src/core/ut.h index f2173d3dcf..385db99ca7 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1110,6 +1110,10 @@ char *strz_casesearch_strz(char *textz, char *needlez); char *str_casesearch_strz(str *text, char *needlez); +char *str_rsearch(str *text, str *needle); + +char *str_rcasesearch(str *text, str *needle); + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or

1 0

git:master:2ae296f5: posops: handle negative index parameter for find functions
by Daniel-Constantin Mierla 23 Sep '21

23 Sep '21

Module: kamailio Branch: master Commit: 2ae296f5d8fa2baa2d451213d668fdd8fabe06d9 URL: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-23T09:06:51+02:00 posops: handle negative index parameter for find functions --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… Patch: https://github.com/kamailio/kamailio/commit/2ae296f5d8fa2baa2d451213d668fdd… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index 7aa9620343..b0b67b117e 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -246,7 +246,8 @@ $var(pos) = pos_body_end(); val is at index 0, it returns the value specified by modparam idx0. </para> <para> - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the buffer. </para> <para> The val can be a static string or variables. @@ -274,7 +275,8 @@ $var(idx) = pos_find_str("100", "kamailio"); by modparam idx0. </para> <para> - The idx can be an integer value or a variable holding an integer. + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the buffer. </para> <para> The val can be a static string or variables. diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 8c538720ce..6e367c53aa 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -427,13 +427,15 @@ static int ki_posops_pos_find_str(sip_msg_t *msg, int idx, str *val) char *p; str text; - if(idx<0 || val==NULL || val->s==NULL || val->len<=0) { + if(val==NULL || val->s==NULL || val->len<=0) { return -1; } - if(idx > msg->len - val->len) { + if(idx<0) { + idx += msg->len; + } + if(idx<0 || idx > msg->len - val->len) { return -1; } - text.s = msg->buf + idx; text.len = msg->len - idx; p = str_search(&text, val); @@ -476,10 +478,13 @@ static int ki_posops_pos_findi_str(sip_msg_t *msg, int idx, str *val) char *p; str text; - if(idx<0 || val==NULL || val->s==NULL || val->len<=0) { + if(val==NULL || val->s==NULL || val->len<=0) { return -1; } - if(idx > msg->len - val->len) { + if(idx<0) { + idx += msg->len; + } + if(idx<0 || idx > msg->len - val->len) { return -1; }

1 0

git:master:706dd0c9: posops: adjust offset on negative index for update ops
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: master Commit: 706dd0c9bf528881d758bc5c26f05870d8f22e35 URL: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T21:19:01+02:00 posops: adjust offset on negative index for update ops --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… Patch: https://github.com/kamailio/kamailio/commit/706dd0c9bf528881d758bc5c26f0587… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 4c0c1b1535..8c538720ce 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -153,7 +153,7 @@ static int ki_posops_pos_append(sip_msg_t *msg, int idx, str *val) } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; } @@ -206,7 +206,7 @@ static int ki_posops_pos_insert(sip_msg_t *msg, int idx, str *val) } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; } @@ -259,7 +259,7 @@ static int ki_posops_pos_rm(sip_msg_t *msg, int idx, int len) return -1; } if(idx<0) { - offset = msg->len + idx + 1; + offset = msg->len + idx; } else { offset = idx; }

1 0

[kamailio/kamailio] how to choose 2 different rr heads (#2861)
by hance2010 22 Sep '21

22 Sep '21

### Description how to choose 2 different rr heads when relay a public call to lan? Thanks! ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 5.5.1 ``` * **Operating System**:  ``` debian10 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2861

2 2

Kamailio v5.4.7 Released
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Hello, Kamailio SIP Server v5.4.7 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.6. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.7. Note that 5.4 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.5, with v5.5.2 being release out of it. For more details about version 5.4.7 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/09/kamailio-v5-4-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:5.4:a19fe100: ChangeLog: content updated for v5.4.7
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: a19fe100777c2c53e275804568cee99e3d61f466 URL: https://github.com/kamailio/kamailio/commit/a19fe100777c2c53e275804568cee99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T12:28:15+02:00 ChangeLog: content updated for v5.4.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/a19fe100777c2c53e275804568cee99… Patch: https://github.com/kamailio/kamailio/commit/a19fe100777c2c53e275804568cee99…

1 0

git:5.4:b647485d: Makefile.defs: version set to 5.4.7
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: b647485d7e5f91c7ecfed167289ff21a91c739fa URL: https://github.com/kamailio/kamailio/commit/b647485d7e5f91c7ecfed167289ff21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T12:27:56+02:00 Makefile.defs: version set to 5.4.7 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b647485d7e5f91c7ecfed167289ff21… Patch: https://github.com/kamailio/kamailio/commit/b647485d7e5f91c7ecfed167289ff21… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 542ac73cdc..c7695a973d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 6 +SUBLEVEL = 7 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:de082004: pkg/kamailoio: version set to 5.4.7 for rpm and alpine specs
by Daniel-Constantin Mierla 22 Sep '21

22 Sep '21

Module: kamailio Branch: 5.4 Commit: de082004b3e5f4719b961850045a3971b7feba8e URL: https://github.com/kamailio/kamailio/commit/de082004b3e5f4719b961850045a397… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-22T10:51:41+02:00 pkg/kamailoio: version set to 5.4.7 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/de082004b3e5f4719b961850045a397… Patch: https://github.com/kamailio/kamailio/commit/de082004b3e5f4719b961850045a397… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f4ff87ce2d..b9d6a15066 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.6 +pkgver=5.4.7 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index e73c048b22..695c46797c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.6 +%define ver 5.4.7 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2021