sr-dev July 2021

sr-dev@lists.kamailio.org

13 participants
227 discussions

git:master:9ec9d9ce: modules: readme files regenerated - textopsx ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9ec9d9ceb0b69d46d5a4d90a86b1185951feb9d4 URL: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-12T08:16:23+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… Patch: https://github.com/kamailio/kamailio/commit/9ec9d9ceb0b69d46d5a4d90a86b1185… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index e290fc172f..a72249f1be 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -37,6 +37,7 @@ Daniel-Constantin Mierla 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 3. Selects @@ -64,7 +65,8 @@ Daniel-Constantin Mierla 1.16. hf_iterator_start usage 1.17. hf_iterator_end usage 1.18. hf_iterator_next usage - 1.19. @hf_value select usage + 1.19. hf_iterator_rm usage + 1.20. @hf_value select usage Chapter 1. Admin Guide @@ -91,6 +93,7 @@ Chapter 1. Admin Guide 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 3. Selects @@ -128,6 +131,7 @@ Chapter 1. Admin Guide 2.16. hf_iterator_start(iname) 2.17. hf_iterator_end(iname) 2.18. textopsx.f.hf_iterator_next(iname) + 2.19. hf_iterator_rm(iname) 2.1. msg_apply_changes() @@ -470,6 +474,25 @@ hf_iterator_end("i1"); hf_iterator_end("i1"); ... +2.19. hf_iterator_rm(iname) + + Remove the header at the current iterator position. + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.19. hf_iterator_rm usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_rm("i1"); + } + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -505,7 +528,7 @@ hf_iterator_end("i1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.19. @hf_value select usage + Example 1.20. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

3 years, 4 months

git:master:adc3bc18: textopsx: added hf_iterator_rm()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: adc3bc18477108fc976182a2efe5d1e314bac795 URL: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T08:02:07+02:00 textopsx: added hf_iterator_rm() - remove the header at the current iterator position --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… Patch: https://github.com/kamailio/kamailio/commit/adc3bc18477108fc976182a2efe5d1e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 362cbee0e1..ec3e1afb75 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -76,6 +76,7 @@ static int assign_hf_value2_fixup(void **param, int param_no); static int w_hf_iterator_start(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_next(sip_msg_t *msg, char *piname, char *p2); static int w_hf_iterator_end(sip_msg_t *msg, char *piname, char *p2); +static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2); static int bind_textopsx(textopsx_api_t *tob); @@ -136,6 +137,8 @@ static cmd_export_t cmds[] = { fixup_free_spve_null, ANY_ROUTE}, {"hf_iterator_end", w_hf_iterator_end, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"hf_iterator_rm", w_hf_iterator_rm, 1, fixup_spve_null, + fixup_free_spve_null, ANY_ROUTE}, {"bind_textopsx", (cmd_function)bind_textopsx, 1, 0, 0, ANY_ROUTE}, @@ -1993,6 +1996,67 @@ static int w_hf_iterator_end(sip_msg_t *msg, char *piname, char *p2) return ki_hf_iterator_end(msg, &iname); } +/** + * + */ +static int ki_hf_iterator_index(sip_msg_t *msg, str *iname) +{ + int i; + int k; + + k = -1; + for(i=0; i<HF_ITERATOR_SIZE; i++) { + if(_hf_iterators[i].name.len>0) { + if(_hf_iterators[i].name.len==iname->len + && strncmp(_hf_iterators[i].name.s, iname->s, iname->len)==0) { + k = i; + break; + } + } + } + if(k==-1) { + LM_ERR("iterator not available [%.*s]\n", iname->len, iname->s); + return -1; + } + + return k; +} + +/** + * + */ +static int ki_hf_iterator_rm(sip_msg_t *msg, str *iname) +{ + int k; + sr_lump_t *anchor; + + k = ki_hf_iterator_index(msg, iname); + if(k<0 || _hf_iterators[k].it==NULL) { + return -1; + } + anchor = del_lump(msg, _hf_iterators[k].it->name.s - msg->buf, + _hf_iterators[k].it->len, 0); + if (anchor==0) { + LM_ERR("cannot remove hdr %.*s\n", _hf_iterators[k].it->name.len, + _hf_iterators[k].it->name.s); + return -1; + } + return 1; +} + +/** + * + */ +static int w_hf_iterator_rm(sip_msg_t *msg, char *piname, char *p2) +{ + str iname = STR_NULL; + if(fixup_get_svalue(msg, (gparam_t*)piname, &iname)<0) { + LM_ERR("failed to get iterator name\n"); + return -1; + } + return ki_hf_iterator_rm(msg, &iname); +} + /** * */ @@ -2606,6 +2670,11 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("hf_iterator_rm"), + SR_KEMIP_INT, ki_hf_iterator_rm, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

3 years, 4 months

git:master:4a4b8047: textopsx: docs for hf_iterator_rm()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4a4b8047b4b46b003bc0b12b737ca956658d18cb URL: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-12T08:06:07+02:00 textopsx: docs for hf_iterator_rm() --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… Patch: https://github.com/kamailio/kamailio/commit/4a4b8047b4b46b003bc0b12b737ca95… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index f9c388016e..c1c5fd5f64 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -561,6 +561,34 @@ hf_iterator_end("i1"); } hf_iterator_end("i1"); ... +</programlisting> + </example> + </section> + <section id="textopsx.f.hf_iterator_rm"> + <title> + <function moreinfo="none">hf_iterator_rm(iname)</function> + </title> + <para> + Remove the header at the current iterator position. + </para> + <para> + The parameter can be dynamic string with variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>hf_iterator_rm</function> usage</title> + <programlisting format="linespecific"> +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_rm("i1"); + } + } + hf_iterator_end("i1"); +... </programlisting> </example> </section>

3 years, 4 months

range transformation or var

by Brandon Armstead

Is there a way to generate a random number between min and max currently? i.e. $var(rand) = $rand(0, 5) // generates a random int between 0 and 5? This could be useful for in configuration weighting / load distribution without a dispatcher module. Thanks!

3 years, 4 months

git:master:56e93559: textopsx: hf iterator functions exported to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 56e935595a60e2c7c5c92fa8438941ea68436c23 URL: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-10T06:47:19+02:00 textopsx: hf iterator functions exported to kemi --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… Patch: https://github.com/kamailio/kamailio/commit/56e935595a60e2c7c5c92fa8438941e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index d3295bf02c..362cbee0e1 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2591,6 +2591,21 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("hf_iterator_start"), + SR_KEMIP_INT, ki_hf_iterator_start, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textopsx"), str_init("hf_iterator_end"), + SR_KEMIP_INT, ki_hf_iterator_end, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textopsx"), str_init("hf_iterator_next"), + SR_KEMIP_INT, ki_hf_iterator_next, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

3 years, 4 months

Kamailio websocket state FINWAIT1 after switchover

by Shahid Hussain

Hi !., Kamailio websocket state is going into FINWAIT1 without sending FIN message out when we do service kamailio restart. I have a Primary and Secondary node configured. When I perform switchover socket status is going into FINWAIT1 state without sending FIN to the client hence client status is showing established, This is happening 90+% of times but does work sometimes. AT Kamailio: [root@localhost ~]# netstat -tunelap | grep 41034 tcp 0 1 172.27.45.198:9040 172.27.6.98:41034 FIN_WAIT1 0 0 - [root@localhost ~]# AT Nginx (client): root@meet:~# netstat -tunelap | grep 9040 tcp 0 0 172.27.6.98:41034 172.27.45.198:9040 ESTABLISHED 33 763106 1322/nginx: worker root@meet:~# Thanks, Shahid

3 years, 4 months

git:master:4c6abaf9: topos: fix missing xavu_field_contact_host evaluation for contact_mode 0

by Henning Westerholt

Module: kamailio Branch: master Commit: 4c6abaf9066aebbd304391dd6730cad7ee592611 URL: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-07-08T14:57:27Z topos: fix missing xavu_field_contact_host evaluation for contact_mode 0 - fix missing xavu_field_contact_host evaluation for contact_mode 0 - it works currently only for contact_mode 1 and 2, but not for default mode --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… Patch: https://github.com/kamailio/kamailio/commit/4c6abaf9066aebbd304391dd6730cad… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 6e88b35af3..b94a960340 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -411,13 +411,23 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir, *td->cp = '@'; td->cp++; - if (_tps_contact_host.len) { - /* using configured hostname in the contact header */ - memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); - td->cp += _tps_contact_host.len; + /* contact_host xavu takes preference */ + if (_tps_xavu_cfg.len>0 && _tps_xavu_field_contact_host.len>0) { + vavu = xavu_get_child_with_sval(&_tps_xavu_cfg, + &_tps_xavu_field_contact_host); + } + if(vavu!=NULL && vavu->val.v.s.len>0) { + memcpy(td->cp, vavu->val.v.s.s, vavu->val.v.s.len); + td->cp += vavu->val.v.s.len; } else { - memcpy(td->cp, puri.host.s, puri.host.len); - td->cp += puri.host.len; + if (_tps_contact_host.len) { + /* using configured hostname in the contact header */ + memcpy(td->cp, _tps_contact_host.s, _tps_contact_host.len); + td->cp += _tps_contact_host.len; + } else { + memcpy(td->cp, puri.host.s, puri.host.len); + td->cp += puri.host.len; + } } if(puri.port.len>0) { *td->cp = ':';

3 years, 4 months

git:5.5:557ac56a: core: str list - added function to insert a block string in list

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 557ac56a6ec6b4ca3d76a57ff8b21c64027791f2 URL: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:12+02:00 core: str list - added function to insert a block string in list (cherry picked from commit b92b931c26c199b756fd08e9c80cc9305469fd2b) --- Modified: src/core/str_list.c Modified: src/core/str_list.h --- Diff: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… Patch: https://github.com/kamailio/kamailio/commit/557ac56a6ec6b4ca3d76a57ff8b21c6… --- diff --git a/src/core/str_list.c b/src/core/str_list.c index f63b4c9151..207cee5bc3 100644 --- a/src/core/str_list.c +++ b/src/core/str_list.c @@ -13,13 +13,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file + * @file * @brief Kamailio core :: Simple str type list and helper functions * @ingroup core * Module: @ref core @@ -32,7 +32,7 @@ /** * @brief Add a new allocated list element to an existing list - * + * * Add a new allocated list element to an existing list, the allocation is done * from the private memory pool * @param s input character @@ -43,18 +43,45 @@ */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total) { - struct str_list *new; - new = pkg_malloc(sizeof(struct str_list)); - if (!new) { + struct str_list *nv; + nv = pkg_malloc(sizeof(struct str_list)); + if (!nv) { PKG_MEM_ERROR; return 0; } - new->s.s = s; - new->s.len = len; - new->next = 0; + nv->s.s = s; + nv->s.len = len; + nv->next = 0; - (*last)->next = new; - *last = new; + (*last)->next = nv; + *last = nv; *total += len; - return new; + return nv; +} + +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len) +{ + str_list_t *nv; + nv = pkg_mallocxz(sizeof(str_list_t) + (len+1)*sizeof(char)); + if (!nv) { + PKG_MEM_ERROR; + return 0; + } + nv->s.s = (char*)nv + sizeof(str_list_t); + memcpy(nv->s.s, s, len); + nv->s.len = len; + nv->next = *head; + *head = nv; + + return nv; } diff --git a/src/core/str_list.h b/src/core/str_list.h index db3fa12887..1eac2578b0 100644 --- a/src/core/str_list.h +++ b/src/core/str_list.h @@ -51,4 +51,16 @@ typedef struct str_list { */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total); +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len); + #endif

3 years, 4 months

git:master:3a0a9292: modules: readme files regenerated - textopsx ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3a0a9292ec40d25f5246573d4a2a51838819d930 URL: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-07T12:46:15+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… Patch: https://github.com/kamailio/kamailio/commit/3a0a9292ec40d25f5246573d4a2a518… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index dbb27653a0..e290fc172f 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -34,6 +34,9 @@ Daniel-Constantin Mierla 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 3. Selects @@ -58,7 +61,10 @@ Daniel-Constantin Mierla 1.13. include_hf_value usage 1.14. exclude_hf_value usage 1.15. hf_value_exists usage - 1.16. @hf_value select usage + 1.16. hf_iterator_start usage + 1.17. hf_iterator_end usage + 1.18. hf_iterator_next usage + 1.19. @hf_value select usage Chapter 1. Admin Guide @@ -82,6 +88,9 @@ Chapter 1. Admin Guide 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 3. Selects @@ -116,6 +125,9 @@ Chapter 1. Admin Guide 2.13. include_hf_value(hf, hvalue) 2.14. exclude_hf_value(hf, hvalue) 2.15. hf_value_exists(hf, hvalue) + 2.16. hf_iterator_start(iname) + 2.17. hf_iterator_end(iname) + 2.18. textopsx.f.hf_iterator_next(iname) 2.1. msg_apply_changes() @@ -406,6 +418,58 @@ if (@hf_value_exists.supported.path == "1") { } ... +2.16. hf_iterator_start(iname) + + Start an iterator for headers in the current SIP message. The parameter + iname is used to identify the iterator. There can be up to 4 iterators + at the same time, with different name. + + The parameter can be a dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.16. hf_iterator_start usage +... +hf_iterator_start("i1"); +... + +2.17. hf_iterator_end(iname) + + Close the iterator identified by iname parameter. The iname value must + be the same used for sht_iterator_start(). + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.17. hf_iterator_end usage +... +hf_iterator_end("i1"); +... + +2.18. textopsx.f.hf_iterator_next(iname) + + Move the iterator to the next header. It must be called also after + sht_iterator_start() to get the first header. + + The return code is false when there is no other header in the list. + + The item name and value are accessible via variables: $hfitname(iname) + and $hfitbody(iname). + + The parameter can be dynamic string with variables. + + This function can be used from ANY_ROUTE. + + Example 1.18. hf_iterator_next usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + xlog("hdr[$hfitname(i1)] is: $hfitbody(i1)\n"); + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -441,7 +505,7 @@ if (@hf_value_exists.supported.path == "1") { * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.16. @hf_value select usage + Example 1.19. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

3 years, 4 months

git:master:7f4d7725: textopsx: return false on iterator end of headers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7f4d7725a55379ef0e7ee5c5a2050d3b1d4565bc URL: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T12:39:06+02:00 textopsx: return false on iterator end of headers --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… Patch: https://github.com/kamailio/kamailio/commit/7f4d7725a55379ef0e7ee5c5a2050d3… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index ee220fbb82..d3295bf02c 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -93,7 +93,7 @@ static int pv_get_hf_iterator_hbody(sip_msg_t *msg, pv_param_t *param, static pv_export_t mod_pvs[] = { { {"hfitname", sizeof("hfitname")-1}, PVT_OTHER, pv_get_hf_iterator_hname, 0, pv_parse_hf_iterator_name, 0, 0, 0 }, - { {"hfitbody", sizeof("hfitname")-1}, PVT_OTHER, pv_get_hf_iterator_hbody, 0, + { {"hfitbody", sizeof("hfitbody")-1}, PVT_OTHER, pv_get_hf_iterator_hbody, 0, pv_parse_hf_iterator_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -1924,6 +1924,10 @@ static int ki_hf_iterator_next(sip_msg_t *msg, str *iname) LM_ERR("iterator not available [%.*s]\n", iname->len, iname->s); return -1; } + if(_hf_iterators[k].eoh == 1) { + return -1; + } + if(_hf_iterators[k].it == NULL) { _hf_iterators[k].it = msg->headers; } else { @@ -1931,6 +1935,7 @@ static int ki_hf_iterator_next(sip_msg_t *msg, str *iname) } if(_hf_iterators[k].it == NULL) { _hf_iterators[k].eoh = 1; + return -1; } return 1; }

3 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2021