sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
278 discussions

[kamailio/kamailio] Korayvt/parse headers change (PR #3224)

by korayvt

#### 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  When I upgraded kamailio version to 5.6.1, some http requests hit msg headers control and failed. I think ksr_sip_parser_mode check should be added here for backward compatibility. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3224 -- Commit Summary -- * Merge pull request #1 from kamailio/master * Merge pull request #2 from kamailio/master * Merge pull request #3 from kamailio/master * Merge branch 'kamailio:master' into master * core: added parser mode check -- File Changes -- M src/core/parser/msg_parser.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3224.patch https://github.com/kamailio/kamailio/pull/3224.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3224 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3224(a)github.com>

1 year, 9 months

[kamailio/kamailio] pv: add monotonic clock to TimeVal pseudovariable (PR #3191)

by Matteo

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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  Sometime is helpful to have a monotonic timer to attach to events in order to discard out-of-order ones on receiving side. Current time values are not ideal since are subject to clock skews, adjustment and so on. Since we have system monotonic clock we can use that value to have a monotonic counter. To be 100% fair CLOCK_MONOTONIC can still be skewed only by ntp adjustment, that's why we try to use CLOCK_MONOTONIC_RAW which is linux-only (afaik) that do not suffer from such adjustments. The new pseudovariable is `$TV(Sm)`, which returns the monotonic counter as a string. Note that even if is based on clock, it starts from an unspecified point in time, so should really be treated as an always increasing counter. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3191 -- Commit Summary -- * pv: add monotonic clock to TimeVal pseudovariable -- File Changes -- M src/modules/pv/pv_time.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3191.patch https://github.com/kamailio/kamailio/pull/3191.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3191 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3191(a)github.com>

1 year, 9 months

git:master:5d09caf0: pv: add monotonic clock to TimeVal pseudovariable

by Henning Westerholt

Module: kamailio Branch: master Commit: 5d09caf029ed4271ac6dc856cb70cbf375b4c7f1 URL: https://github.com/kamailio/kamailio/commit/5d09caf029ed4271ac6dc856cb70cbf… Author: Matteo Brancaleoni <matteo.brancaleoni(a)voismart.it> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-23T11:11:47+02:00 pv: add monotonic clock to TimeVal pseudovariable - adds $TV(Sm) pseudovariable which returns the system monotonic clock as a string - on Linux, tries to use CLOCK_MONOTONIC_RAW which does not suffer from ntp time adjustement --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/5d09caf029ed4271ac6dc856cb70cbf… Patch: https://github.com/kamailio/kamailio/commit/5d09caf029ed4271ac6dc856cb70cbf… --- diff --git a/src/modules/pv/pv_time.c b/src/modules/pv/pv_time.c index 4a9cc14dd1..a05134f5e4 100644 --- a/src/modules/pv/pv_time.c +++ b/src/modules/pv/pv_time.c @@ -23,6 +23,8 @@ #include <ctype.h> #include <string.h> #include <stdlib.h> +#include <stdint.h> +#include <inttypes.h> #include <stdio.h> #include <time.h> #include <sys/time.h> @@ -33,6 +35,12 @@ #include "pv_time.h" +#if defined(CLOCK_MONOTONIC_RAW) +#define PV_MONOTONIC_CLOCK CLOCK_MONOTONIC_RAW +#else +#define PV_MONOTONIC_CLOCK CLOCK_MONOTONIC +#endif + int pv_parse_time_name(pv_spec_p sp, str *in) { if(sp==NULL || in==NULL || in->len<=0) @@ -306,6 +314,7 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { struct timeval tv; + struct timespec ts; str s; struct tm lt; char lbuf[64]; @@ -355,7 +364,18 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); s.s = _timeval_ts_buf; return pv_get_strval(msg, param, res, &s); - + case 6: + if (!clock_gettime(PV_MONOTONIC_CLOCK, &ts)) { + s.len = snprintf(_timeval_ts_buf, 64, "%" PRIu64, + (u_int64_t)ts.tv_sec * 1000000000 + (u_int64_t)ts.tv_nsec); + if(s.len<0) + return pv_get_null(msg, param, res); + s.s = _timeval_ts_buf; + return pv_get_strval(msg, param, res, &s); + } else { + LM_ERR("unable to get monotonic clock value\n"); + return pv_get_null(msg, param, res); + } default: msg_set_time(msg); return pv_get_uintval(msg, param, res, (unsigned int)msg->tval.tv_sec); @@ -385,6 +405,8 @@ int pv_parse_timeval_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else if(strncmp(in->s, "Fn", 2)==0) sp->pvp.pvn.u.isname.name.n = 5; + else if(strncmp(in->s, "Sm", 2)==0) + sp->pvp.pvn.u.isname.name.n = 6; else goto error; break; default:

1 year, 9 months

git:master:181bc683: core: aliased dns_rev_via to rev_dns

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 181bc683f6f0496b80c5997a4de30a21c04ce0bc URL: https://github.com/kamailio/kamailio/commit/181bc683f6f0496b80c5997a4de30a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-23T09:58:03+02:00 core: aliased dns_rev_via to rev_dns --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/181bc683f6f0496b80c5997a4de30a2… Patch: https://github.com/kamailio/kamailio/commit/181bc683f6f0496b80c5997a4de30a2… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index d11406b1b5..edb8a1bb73 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -312,7 +312,7 @@ DOMAIN domain SR_AUTO_ALIASES auto_aliases SR_AUTO_DOMAINS auto_domains DNS dns -REV_DNS rev_dns +REV_DNS rev_dns|dns_rev_via DNS_TRY_IPV6 dns_try_ipv6 DNS_TRY_NAPTR dns_try_naptr DNS_SRV_LB dns_srv_lb|dns_srv_loadbalancing

1 year, 9 months

git:master:f71d984e: core: aliased dns_use_failover to use_dns_failover

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f71d984edc21c015fc4c81682b115b510169b713 URL: https://github.com/kamailio/kamailio/commit/f71d984edc21c015fc4c81682b115b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-23T09:58:03+02:00 core: aliased dns_use_failover to use_dns_failover --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/f71d984edc21c015fc4c81682b115b5… Patch: https://github.com/kamailio/kamailio/commit/f71d984edc21c015fc4c81682b115b5… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 76fd8d704d..d11406b1b5 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -330,7 +330,7 @@ DNS_NAPTR_IGNORE_RFC dns_naptr_ignore_rfc /* dns cache */ DNS_CACHE_INIT dns_cache_init DNS_USE_CACHE use_dns_cache|dns_use_cache -DNS_USE_FAILOVER use_dns_failover +DNS_USE_FAILOVER use_dns_failover|dns_use_failover DNS_CACHE_FLAGS dns_cache_flags DNS_CACHE_NEG_TTL dns_cache_negative_ttl DNS_CACHE_MIN_TTL dns_cache_min_ttl

1 year, 9 months

git:master:31ff79be: core: aliased dns_use_cache to use_dns_cache

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 31ff79be68c262dc74ec4baaae8f9991ffbe7438 URL: https://github.com/kamailio/kamailio/commit/31ff79be68c262dc74ec4baaae8f999… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-23T09:58:02+02:00 core: aliased dns_use_cache to use_dns_cache --- Modified: src/core/cfg.lex Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/31ff79be68c262dc74ec4baaae8f999… Patch: https://github.com/kamailio/kamailio/commit/31ff79be68c262dc74ec4baaae8f999… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index a5a595f98c..76fd8d704d 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -329,7 +329,7 @@ DNS_SEARCH_FMATCH dns_search_full_match DNS_NAPTR_IGNORE_RFC dns_naptr_ignore_rfc /* dns cache */ DNS_CACHE_INIT dns_cache_init -DNS_USE_CACHE use_dns_cache +DNS_USE_CACHE use_dns_cache|dns_use_cache DNS_USE_FAILOVER use_dns_failover DNS_CACHE_FLAGS dns_cache_flags DNS_CACHE_NEG_TTL dns_cache_negative_ttl diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1410d80b43..ab5bdc4887 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2259,7 +2259,7 @@ int pv_get_hfl(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); if(thdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); - return pv_get_sintval(msg, param, res, 0); + return pv_get_null(msg, param, res); } if(thdr.type!=HDR_OTHER_T) { tv.flags = 0;

1 year, 9 months

git:master:a10da3a8: pv: parse header name given with variable to $hdr() and $hdrc()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a10da3a8802fd02bab9e8c655aa845d121370fd4 URL: https://github.com/kamailio/kamailio/commit/a10da3a8802fd02bab9e8c655aa845d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-23T09:58:02+02:00 pv: parse header name given with variable to $hdr() and $hdrc() --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/a10da3a8802fd02bab9e8c655aa845d… Patch: https://github.com/kamailio/kamailio/commit/a10da3a8802fd02bab9e8c655aa845d… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5d310ecea7..1410d80b43 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2128,6 +2128,7 @@ int pv_get_hdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int idx; int idxf; pv_value_t tv = {0}; + hdr_field_t thdr = {0}; if(msg==NULL || res==NULL || param==NULL) return -1; @@ -2138,6 +2139,15 @@ int pv_get_hdr(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return -1; } + parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + if(thdr.type==HDR_ERROR_T) { + LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); + return pv_get_null(msg, param, res); + } + if(thdr.type!=HDR_OTHER_T) { + tv.flags = 0; + tv.ri = thdr.type; + } } else { if(param->pvn.u.isname.type == AVP_NAME_STR) { tv.flags = PV_VAL_STR; @@ -2162,6 +2172,7 @@ int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { pv_value_t tv; struct hdr_field *hf; + hdr_field_t thdr = {0}; int hcount; if(msg==NULL || res==NULL || param==NULL) @@ -2177,6 +2188,15 @@ int pv_get_hdrc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) LM_ERR("invalid name\n"); return pv_get_sintval(msg, param, res, hcount); } + parse_hname2_short(tv.rs.s, tv.rs.s + tv.rs.len, &thdr); + if(thdr.type==HDR_ERROR_T) { + LM_ERR("error parsing header name [%.*s]\n", tv.rs.len, tv.rs.s); + return pv_get_sintval(msg, param, res, 0); + } + if(thdr.type!=HDR_OTHER_T) { + tv.flags = 0; + tv.ri = thdr.type; + } } else { if(param->pvn.u.isname.type == AVP_NAME_STR) {

1 year, 9 months

[kamailio/kamailio] Corrected a typo ("endabled") (PR #3223)

by Ash-v-G

Very minor change correcting a misspelled word in the main config file.  #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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/3223 -- Commit Summary -- * Corrected a typo ("endabled") -- File Changes -- M etc/kamailio.cfg (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3223.patch https://github.com/kamailio/kamailio/pull/3223.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3223 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3223(a)github.com>

1 year, 9 months

git:master:b46afeca: etc/kamailio.cfg: corrected a typo ("endabled"), GH #3223

by Henning Westerholt

Module: kamailio Branch: master Commit: b46afeca6c515f5baf1812ca821321117df6478b URL: https://github.com/kamailio/kamailio/commit/b46afeca6c515f5baf1812ca8213211… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-23T07:30:30Z etc/kamailio.cfg: corrected a typo ("endabled"), GH #3223 --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b46afeca6c515f5baf1812ca8213211… Patch: https://github.com/kamailio/kamailio/commit/b46afeca6c515f5baf1812ca8213211… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index eb41c14d41f..11a91100ce7 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -24,7 +24,7 @@ # *** To run in debug mode: # - define WITH_DEBUG # - debug level increased to 3, logs still sent to syslog -# - debugger module loaded with cfgtrace endabled +# - debugger module loaded with cfgtrace enabled # # *** To enable mysql: # - define WITH_MYSQL

1 year, 9 months

[kamailio/kamailio] incomplete values and Wrong Counting for $hfl and $hflc (Issue #3194)

by patrickarton

### Description the counting and values provides by $hfl and $hflc are wrong and imcomplete  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` route { $var(hname) = "Record-Route"; if (is_present_hf_pv("$var(hname)")){ $var(i) = 0; $var(hdrc) = $hflc($var(hname)); xlog("there are $var(hdrc) values for $var(hname)\r\n"); xlog("------------------------------------------\r\n"); while ($var(i) < $var(hdrc)){ $var(val) = $(hfl($var(hname))[$var(i)]); $var(sip_header_ip) = $(var(val){nameaddr.uri}{uri.host}); if ($var(sip_header_ip) != 0){ xlog("checking $var(sip_header_ip) in $var(hname) \r\n"); } $var(i) = $var(i) + 1; } } } ``` #### Log Messages  ``` 0(3729) ERROR: <script>: there are 2 values for Record-Route 0(3729) ERROR: <script>: ------------------------------------------ 0(3729) ERROR: <script>: checking 1.1.1.1 in Record-Route 0(3729) ERROR: <script>: checking 2.2.2.2 in Record-Route ``` #### Expected Results ``` 0(3729) ERROR: <script>: there are 3 values for Record-Route 0(3729) ERROR: <script>: ------------------------------------------ 0(3729) ERROR: <script>: checking 1.1.1.1 in Record-Route 0(3729) ERROR: <script>: checking 2.2.2.2 in Record-Route 0(3729) ERROR: <script>: checking 3.3.3.3 in Record-Route ``` #### SIP Traffic  ``` INVITE sip:+3226200866;trunk=PkGHOlui@127.0.0.1:5060;cid=EMDLfGdgrDD SIP/2.0 Via: SIP/2.0/UDP 127.0.0.1:3030;branch=z9hG4bK-3708-1-0 Record-Route: <sip:1.1.1.1;lr=on;nat=yes> Record-Route: <sip:2.2.2.2:5060;lr;transport=udp>,<sip:3.3.3.3:22506;lr;transport=udp> From: <sip:8325000000@127.0.0.1:5060>;tag=3708SIPpTag091 To: <sip:++212-94939-43433226200866@127.0.0.1:5060> Call-ID: 1-3708(a)127.0.0.1 CSeq: 1 INVITE Max-Forwards: 70 Content-Type: application/sdp ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` * **Operating System**:  ``` (paste your output here) ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3194 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3194(a)github.com>

1 year, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2022