sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
307 discussions

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

21 Sep '21

Module: kamailio Branch: master Commit: 22f8dca3ff941addf69148f237c1127e271b00e1 URL: https://github.com/kamailio/kamailio/commit/22f8dca3ff941addf69148f237c1127… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-21T16:01:16+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/22f8dca3ff941addf69148f237c1127… Patch: https://github.com/kamailio/kamailio/commit/22f8dca3ff941addf69148f237c1127… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index d10e25fb3e..319e654c50 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -37,6 +37,8 @@ Daniel-Constantin Mierla 4.5. pos_headers_end() 4.6. pos_body_start() 4.7. pos_body_end() + 4.8. pos_find_str(idx, val) + 4.9. pos_findi_str(idx, val) List of Examples @@ -48,6 +50,8 @@ Daniel-Constantin Mierla 1.6. pos_headers_end() usage 1.7. pos_body_start() usage 1.8. pos_body_end() usage + 1.9. pos_find_str() usage + 1.10. pos_findi_str() usage Chapter 1. Admin Guide @@ -72,6 +76,8 @@ Chapter 1. Admin Guide 4.5. pos_headers_end() 4.6. pos_body_start() 4.7. pos_body_end() + 4.8. pos_find_str(idx, val) + 4.9. pos_findi_str(idx, val) 1. Overview @@ -124,6 +130,8 @@ modparam("posops", "idx0", -200) 4.5. pos_headers_end() 4.6. pos_body_start() 4.7. pos_body_end() + 4.8. pos_find_str(idx, val) + 4.9. pos_findi_str(idx, val) 4.1. pos_append(idx, val) @@ -221,3 +229,38 @@ $var(pos) = pos_body_start(); ... $var(pos) = pos_body_end(); ... + +4.8. pos_find_str(idx, val) + + Return the position of the val in message buffer starting at idx. 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. + + The val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.9. pos_find_str() usage +... +$var(idx) = pos_find_str("100", "kamailio"); +... + +4.9. pos_findi_str(idx, val) + + Return the position of the val (matching case insensitive) in message + buffer starting at idx. 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. + + The val can be a static string or variables. + + This function can be used from ANY_ROUTE. + + Example 1.10. pos_findi_str() usage +... +$var(idx) = pos_findi_str("100", "kamailio"); +...

1 0

git:master:e39f77e9: posops: functions to get the position of a string in message buffer
by Daniel-Constantin Mierla 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: e39f77e9c685cf64df6cf6ac255cb0c786c415b6 URL: https://github.com/kamailio/kamailio/commit/e39f77e9c685cf64df6cf6ac255cb0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-21T15:51:07+02:00 posops: functions to get the position of a string in message buffer --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e39f77e9c685cf64df6cf6ac255cb0c… Patch: https://github.com/kamailio/kamailio/commit/e39f77e9c685cf64df6cf6ac255cb0c…

1 0

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

21 Sep '21

Module: kamailio Branch: master Commit: 23a2bc69464d622d700a53bd860ac0dd60ae3747 URL: https://github.com/kamailio/kamailio/commit/23a2bc69464d622d700a53bd860ac0d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-21T10:31:29+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/23a2bc69464d622d700a53bd860ac0d… Patch: https://github.com/kamailio/kamailio/commit/23a2bc69464d622d700a53bd860ac0d…

1 0

git:master:771ce943: posops: added idx0 mod param
by Daniel-Constantin Mierla 21 Sep '21

21 Sep '21

Module: kamailio Branch: master Commit: 771ce9436adb250a398e1fd337e712c0d5c67745 URL: https://github.com/kamailio/kamailio/commit/771ce9436adb250a398e1fd337e712c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-21T10:23:53+02:00 posops: added idx0 mod param - set the value to return by function when position is at index 0 - default -255 --- Modified: src/modules/posops/doc/posops_admin.xml Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/771ce9436adb250a398e1fd337e712c… Patch: https://github.com/kamailio/kamailio/commit/771ce9436adb250a398e1fd337e712c… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index 9e532d7bf3..4628b0cb29 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -54,6 +54,31 @@ </section> </section> + <section> + <title>Parameters</title> + <section id="posops.p.idx0"> + <title><varname>idx0</varname> (int)</title> + <para> + The value to return by functions seeking a position when the index + is 0 (note: returning 0 is stopping the execution of configuration + file like 'exit', but for KEMI usage it is ok). + </para> + <para> + <emphasis> + Default value is -255. + </emphasis> + </para> + <example> + <title>Set <varname>idx0</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("posops", "idx0", -200) +... +</programlisting> + </example> + </section> + </section> + <section> <title>Functions</title> <section id="posops.f.pos_append"> diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index fc62679afd..3a8746a2a5 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -51,6 +51,8 @@ typedef struct posops_data { int idx; } posops_data_t; +static int posops_idx0 = -255; + static int pv_posops_get_pos(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_posops_parse_pos_name(pv_spec_t *sp, str *in); @@ -87,6 +89,7 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ + {"idx0", PARAM_INT, &posops_idx0}, {0, 0, 0} }; @@ -309,7 +312,7 @@ static int ki_posops_pos_headers_start(sip_msg_t* msg) } _posops_data.idx = msg->first_line.len; - _posops_data.ret = (_posops_data.idx==0)?-255:_posops_data.idx; + _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; return _posops_data.ret; } @@ -334,7 +337,7 @@ static int ki_posops_pos_headers_end(sip_msg_t* msg) } _posops_data.idx = msg->unparsed - msg->buf; - _posops_data.ret = (_posops_data.idx==0)?-255:_posops_data.idx; + _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; return _posops_data.ret; } @@ -367,7 +370,7 @@ static int ki_posops_pos_body_start(sip_msg_t* msg) } _posops_data.idx = body - msg->buf; - _posops_data.ret = (_posops_data.idx==0)?-255:_posops_data.idx; + _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; return _posops_data.ret; } @@ -397,7 +400,7 @@ static int ki_posops_pos_body_end(sip_msg_t* msg) } _posops_data.idx = msg->len; - _posops_data.ret = (_posops_data.idx==0)?-255:_posops_data.idx; + _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; return _posops_data.ret; }

1 0

git:master:10b014b5: lcr: small white-space (related to GH #2859)
by Henning Westerholt 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 10b014b505080a918a8443ff83029a0155364661 URL: https://github.com/kamailio/kamailio/commit/10b014b505080a918a8443ff83029a0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-20T18:14:35Z lcr: small white-space (related to GH #2859) --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/10b014b505080a918a8443ff83029a0… Patch: https://github.com/kamailio/kamailio/commit/10b014b505080a918a8443ff83029a0… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 23b5bce0dc..93c5181600 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -3034,8 +3034,7 @@ static int do_from_gw(struct sip_msg *_m, unsigned int lcr_id, } /* Store tag and flags and return result */ - if((res != NULL) - && ((transport == PROTO_NONE) || (res->transport_code == transport))) { + if((res != NULL) && ((transport == PROTO_NONE) || (res->transport_code == transport))) { LM_DBG("request came from gw\n"); if(tag_avp_param) { val.s.s = res->tag;

1 0

[kamailio/kamailio] lcr: improve binary search to support a match including src port (#2859)
by zenichev 20 Sep '21

20 Sep '21

#### 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 Improve binary search in the lcr module and add a possibility to do a matching not only based on an IP address of a GW, but also using a source port. When a possibility to use 'src_port' parameter in from_gw() and from_any_gw() was introduced here: 14e6fc80b3d2389567c73c4a2196bf8e6d92d8d2 the bsearch() remained untouched, and hence the matching (iteration through existing GWs) is now done only based on an IP address. This leads to the issue, when there are more than one GW with the same IP address in gws table, and from_gw() and from_any_gw() functions are used with the 'src_port' parameter, it can happen that a wrong GW is picked out by bsearch() from gws table (lcr_gw) and a check by from_gw() and from_any_gw() returns False. Hence the matching based on IP address and source port is required for bsearch(), when from_gw() and from_any_gw() functions are used with the 'src_port' parameter. This means backwards compatibility is still present (when one uses functions without 'src_port'). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2859 -- Commit Summary -- * lcr: improve binary search to support a match including src port -- File Changes -- M src/modules/lcr/lcr_mod.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2859.patch https://github.com/kamailio/kamailio/pull/2859.diff -- 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/pull/2859

3 7

git:master:7a3a5443: lcr: remove excessive conditional check in do_from_gw()
by Henning Westerholt 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 7a3a54433bbbfdb2521d4f8981c5b72423299bb1 URL: https://github.com/kamailio/kamailio/commit/7a3a54433bbbfdb2521d4f8981c5b72… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-20T20:09:58+02:00 lcr: remove excessive conditional check in do_from_gw() After an update of the bsearch(), which now supports matching not only by the IP address, but also using the 'src_port', there is no need to check, if the source port of a request matched the one from the 'lcr_gw' ('res' pointer will be NULL anyway, if ports don't match). Nor do we need to check if it's zero. --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7a3a54433bbbfdb2521d4f8981c5b72… Patch: https://github.com/kamailio/kamailio/commit/7a3a54433bbbfdb2521d4f8981c5b72… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 8c5b05d1df..23b5bce0dc 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -3035,8 +3035,7 @@ static int do_from_gw(struct sip_msg *_m, unsigned int lcr_id, /* Store tag and flags and return result */ if((res != NULL) - && ((transport == PROTO_NONE) || (res->transport_code == transport)) - && ((src_port == 0) || (res->port == src_port))) { + && ((transport == PROTO_NONE) || (res->transport_code == transport))) { LM_DBG("request came from gw\n"); if(tag_avp_param) { val.s.s = res->tag;

1 0

git:master:e82819e6: lcr: improve binary search to support a match including src port
by Henning Westerholt 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: e82819e6613dd64ca5c887759eab18cd38d20373 URL: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-20T20:09:58+02:00 lcr: improve binary search to support a match including src port Improve binary search in the lcr module and add a possibility to do a matching not only based on an IP address of a GW, but also using a source port. When a possibility to use 'src_port' parameter in from_gw() and from_any_gw() was introduced here: 14e6fc80b3d2389567c73c4a2196bf8e6d92d8d2 the bsearch() remained untouched, and hence the matching (iteration through existing GWs) is now done only based on an IP address. This leads to the issue, when there are more than one GW with the same IP address in gws table, and from_gw() and from_any_gw() functions are used with the 'src_port' parameter, it can happen that a wrong GW is picked out by bsearch() from gws table (lcr_gw) and a check by from_gw() and from_any_gw() returns False. Hence the matching based on IP address and source port is required for bsearch(), when from_gw() and from_any_gw() functions are used with the 'src_port' parameter. This means backwards compatibility is still present (when one uses functions without 'src_port'). --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… Patch: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 21f05a4730..8c5b05d1df 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -921,6 +921,30 @@ static int comp_gws(const void *_g1, const void *_g2) return memcmp(g1->ip_addr.u.addr, g2->ip_addr.u.addr, g1->ip_addr.len); } +/* + * Compare gateways based on their IP address and port + */ +static int comp_gws_include_port(const void *_g1, const void *_g2) +{ + struct gw_info *g1 = (struct gw_info *)_g1; + struct gw_info *g2 = (struct gw_info *)_g2; + + /* first address family comparison */ + if(g1->ip_addr.af < g2->ip_addr.af) + return -1; + if(g1->ip_addr.af > g2->ip_addr.af) + return 1; + if(g1->ip_addr.len < g2->ip_addr.len) + return -1; + if(g1->ip_addr.len > g2->ip_addr.len) + return 1; + + /* secondly ports comparison */ + if(g1->port != g2->port) + return -1; + + return memcmp(g1->ip_addr.u.addr, g2->ip_addr.u.addr, g1->ip_addr.len); +} /* * Insert gw info into index i or gws table @@ -2997,10 +3021,17 @@ static int do_from_gw(struct sip_msg *_m, unsigned int lcr_id, return -1; } - /* Search for gw ip address */ gw.ip_addr = *src_addr; - res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], - sizeof(struct gw_info), comp_gws); + if (src_port != 0) { + /* Search for gw based on its ip address and port */ + gw.port = src_port; + res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], + sizeof(struct gw_info), comp_gws_include_port); + } else { + /* Search for gw based on its ip address */ + res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], + sizeof(struct gw_info), comp_gws); + } /* Store tag and flags and return result */ if((res != NULL)

1 0

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

20 Sep '21

Module: kamailio Branch: master Commit: a9ef78b7f43616f2ceaa26df97eff68eb5348846 URL: https://github.com/kamailio/kamailio/commit/a9ef78b7f43616f2ceaa26df97eff68… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-20T07:31:16+02:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/a9ef78b7f43616f2ceaa26df97eff68… Patch: https://github.com/kamailio/kamailio/commit/a9ef78b7f43616f2ceaa26df97eff68… --- diff --git a/src/modules/posops/README b/src/modules/posops/README index 9c861862e0..bf003d5a6e 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2021 http://www.asipto.com + Copyright Â© 2021 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -29,12 +29,20 @@ Daniel-Constantin Mierla 3.1. pos_append(idx, val) 3.2. pos_insert(idx, val) 3.3. pos_rm(idx, len) + 3.4. pos_headers_start() + 3.5. pos_headers_end() + 3.6. pos_body_start() + 3.7. pos_body_end() List of Examples 1.1. pos_append() usage 1.2. pos_insert() usage 1.3. pos_rm() usage + 1.4. pos_headers_start() usage + 1.5. pos_headers_end() usage + 1.6. pos_body_start() usage + 1.7. pos_body_end() usage Chapter 1. Admin Guide @@ -51,6 +59,10 @@ Chapter 1. Admin Guide 3.1. pos_append(idx, val) 3.2. pos_insert(idx, val) 3.3. pos_rm(idx, len) + 3.4. pos_headers_start() + 3.5. pos_headers_end() + 3.6. pos_body_start() + 3.7. pos_body_end() 1. Overview @@ -82,8 +94,12 @@ Chapter 1. Admin Guide 3.1. pos_append(idx, val) 3.2. pos_insert(idx, val) 3.3. pos_rm(idx, len) + 3.4. pos_headers_start() + 3.5. pos_headers_end() + 3.6. pos_body_start() + 3.7. pos_body_end() -3.1. pos_append(idx, val) +3.1. pos_append(idx, val) Append the value val after the position idx in the SIP message buffer. @@ -100,7 +116,7 @@ Chapter 1. Admin Guide pos_append("100", "kamailio-$si"); ... -3.2. pos_insert(idx, val) +3.2. pos_insert(idx, val) Insert the value val at the position idx in the SIP message buffer. @@ -117,7 +133,7 @@ pos_append("100", "kamailio-$si"); pos_insert("100", "kamailio-$si"); ... -3.3. pos_rm(idx, len) +3.3. pos_rm(idx, len) Remove len characters starting at the position idx in the SIP message buffer. @@ -135,3 +151,47 @@ pos_insert("100", "kamailio-$si"); ... pos_insert("100", "10"); ... + +3.4. pos_headers_start() + + Return the position in the message buffer where headers start. + + This function can be used from ANY_ROUTE. + + Example 1.4. pos_headers_start() usage +... +$var(pos) = pos_headers_start(); +... + +3.5. pos_headers_end() + + Return the position in the message buffer where headers end. + + This function can be used from ANY_ROUTE. + + Example 1.5. pos_headers_end() usage +... +$var(pos) = pos_headers_end(); +... + +3.6. pos_body_start() + + Return the position in the message buffer where body starts. + + This function can be used from ANY_ROUTE. + + Example 1.6. pos_body_start() usage +... +$var(pos) = pos_body_start(); +... + +3.7. pos_body_end() + + Return the position in the message buffer where body ends. + + This function can be used from ANY_ROUTE. + + Example 1.7. pos_body_end() usage +... +$var(pos) = pos_body_end(); +...

1 0

git:master:1e212088: core: parse identityinfo - log message on end of buffer
by Daniel-Constantin Mierla 20 Sep '21

20 Sep '21

Module: kamailio Branch: master Commit: 1e212088091183aac8fcd418656beea523950870 URL: https://github.com/kamailio/kamailio/commit/1e212088091183aac8fcd418656beea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-20T07:22:57+02:00 core: parse identityinfo - log message on end of buffer --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/1e212088091183aac8fcd418656beea… Patch: https://github.com/kamailio/kamailio/commit/1e212088091183aac8fcd418656beea… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index da613e798f..e58bcd26ff 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -311,8 +311,12 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) return ; parseerror: - LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p,status, (int)(p-buffer), ZSW(p)); + if(p<end) { + LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", + *p, status, (int)(p-buffer), ZSW(p)); + } else { + LM_ERR("unexpected end of buffer - status %d\n", status); + } return ; }

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
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