sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:a9cf4577: tm: new inter-module API function t_find(...)
by Daniel-Constantin Mierla 25 Aug '22

25 Aug '22

Module: kamailio Branch: master Commit: a9cf4577c25d7933531b8969a1941bac4faf8d68 URL: https://github.com/kamailio/kamailio/commit/a9cf4577c25d7933531b8969a1941ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-25T14:51:23+02:00 tm: new inter-module API function t_find(...) - combines get_t() with t_check_msg(...) to get the transaction, returning also if it was referenced or not --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/a9cf4577c25d7933531b8969a1941ba… Patch: https://github.com/kamailio/kamailio/commit/a9cf4577c25d7933531b8969a1941ba… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index f041116bb8..ad41f0de93 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -145,6 +145,28 @@ int get_t_branch() return T_branch; } +/** + * return the transaction by combining get() and t_check_msg() + * - if T is not set, checks the transactions table for msg, and if found, + * sets T and *branch as well as *vref=1 to signal that T was ref'ed + */ +struct cell* t_find(struct sip_msg *msg, int *branch, int *vref) +{ + if(vref) { + *vref = 0; + } + if(T != NULL && T != T_UNDEFINED) { + return T; + } + t_check_msg(msg, branch); + if(T != NULL && T != T_UNDEFINED) { + if(vref) { + *vref = 1; + } + } + return T; +} + static inline int parse_dlg( struct sip_msg *msg ) { if (parse_headers(msg, HDR_FROM_F | HDR_CSEQ_F | HDR_TO_F, 0)==-1) { diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index 1f6596a90d..de65be8365 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -68,6 +68,9 @@ int t_check_msg(struct sip_msg* , int *branch ); typedef struct cell * (*tgett_f)(void); struct cell *get_t(void); +typedef struct cell* (*tfind_f)(struct sip_msg*, int*, int*); +struct cell* t_find(struct sip_msg *msg, int *branch, int *vref); + typedef int (*tgett_branch_f)(void); int get_t_branch(void); diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index 8635b90eae..c9f39b576e 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -92,6 +92,7 @@ int load_tm( struct tm_binds *tmb) tmb->free_dlg = free_dlg; tmb->print_dlg = print_dlg; tmb->t_gett = get_t; + tmb->t_find = t_find; tmb->t_gett_branch = get_t_branch; tmb->t_sett = set_t; tmb->calculate_hooks = w_calculate_hooks; diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index 4695a8f7e1..1f97061d1e 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -71,6 +71,7 @@ struct tm_binds { free_dlg_f free_dlg; print_dlg_f print_dlg; tgett_f t_gett; + tfind_f t_find; tgett_branch_f t_gett_branch; tsett_f t_sett; calculate_hooks_f calculate_hooks;

1 0

[kamailio/kamailio] Make usrloc keepalive call-id more random (Issue #3225)
by Matteo 25 Aug '22

25 Aug '22

### Description Right now, usrloc keepalive method use a somewhat static call-id, built with the prefix `ksrulka-` followed by the number of keepalives sent and the contact index of each AoR pinged. This means that pings to different contacts from different processes (when using timer_procs in usrloc) or when you have multiple proxies each handling a subset of registrar requests, you can have duplicated call-ids. Basically the following happens: - user1 registers to proxy - user2 registers to proxy - different timer processes handles the keepalives - call-ids are the same (it start always from `ksrulka-1.1`) OR - user1 registers to proxyA - user2 registers to proxyB - both proxies start sending keepalives - call-ids are the same (it start always from `ksrulka-1.1`) from both proxies. While this is not a routing problem, bug or whatever, it can be annoying if traffic is analyzed with tools like sngrep, which group messages by the Call-ID header, and if you run sngrep on the edge proxy you'll see both keepalive messages under the same call. Can be also annoying if logs from all proxies are aggregated, making a bit problematic filtering by call-id. ### Expected behavior Call-id should be somewhat random. #### SIP Traffic This is an example for same call-id used for pinging two different AoR on same proxy. ``` 2022/08/23 08:53:35.717668 172.23.42.2:5060 -> 172.23.42.1:5060 OPTIONS sip:user1@192.168.10.123:23045;transport=udp SIP/2.0 Via: SIP/2.0/UDP 172.23.42.2:5060;branch=z9hG4bKx.323.1.0 Route: <sip:172.23.42.1;lr;received=sip:client.public.ip:23045;r2=on>,<sip:kamailio.public.ip;lr;received=sip:client.public.ip:23045;r2=on> From: <sip:pinger@test.proxy>;tag=uloc-1-6304863f-61-2-8a27955a-6304958f-af2a3-143.1 To: <sip:user1@example.com> Call-ID: ksrulka-323.1 CSeq: 80 OPTIONS Content-Length: 0 ``` and ``` 2022/08/23 08:53:35.897076 172.23.42.2:5060 -> 172.23.42.1:5060 OPTIONS sip:user2@192.168.10.130:5060 SIP/2.0 Via: SIP/2.0/UDP 172.23.42.2:5060;branch=z9hG4bKx.323.1.0 Route: <sip:172.23.42.1;lr;received=sip:client.public.ip:60058;r2=on>,<sip:kamailio.public.ip;lr;received=sip:client.public.ip:60058;r2=on> From: <sip:pinger@test.proxy>;tag=uloc-1-6304863f-61-1-86c70e53-6304958f-dafc7-143.1 To: <sip:user2@example.com> Call-ID: ksrulka-323.1 CSeq: 80 OPTIONS Content-Length: 0 ``` ### Possible Solutions To be 100% honest I don't get why such method of generating call-ids has been chosen. The only useful thing I see is that you can have a clue of how many keepalives ping have been sent by each process / proxy while inspecting sip traces. I don't see any usage of the fixed call-id in handling responses. But I may be wrong, since I'm new to kamailio. What could be done is to add a random string to the call-id, like nathelper does. If this is acceptable, I can try to create a PR for that. ### 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 9.4.0 ``` * **Operating System**: Using official docker images of kamailio 5.6.1. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3225 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3225(a)github.com>

3 5

git:master:721daf5c: usrloc: adde random and pid to call-id for keepalive requests
by Daniel-Constantin Mierla 25 Aug '22

25 Aug '22

Module: kamailio Branch: master Commit: 721daf5ca55a8fb366cff2821e249bfff64d8f87 URL: https://github.com/kamailio/kamailio/commit/721daf5ca55a8fb366cff2821e249bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-25T10:48:16+02:00 usrloc: adde random and pid to call-id for keepalive requests - GH #3225 --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/721daf5ca55a8fb366cff2821e249bf… Patch: https://github.com/kamailio/kamailio/commit/721daf5ca55a8fb366cff2821e249bf… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index ffe37fdc73..ba855eb011 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -38,6 +38,7 @@ #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" #include "../../core/parser/parse_rr.h" +#include "../../core/rand/fastrand.h" #include "ul_keepalive.h" @@ -66,7 +67,7 @@ Content-Length: 0\r\n\r\n" "%s%.*s%.*s" \ "From: <%.*s>;tag=%.*s-%x-%lx-%lx-%x.%x\r\n" \ "To: <sip:%.*s%s%.*s>\r\n" \ - "Call-ID: " ULKA_CALLID_PREFIX "%u.%u\r\n" \ + "Call-ID: " ULKA_CALLID_PREFIX "%x-%x-%x.%x\r\n" \ "CSeq: 80 %.*s\r\n" \ "Content-Length: 0\r\n\r\n" @@ -243,6 +244,7 @@ int ul_ka_urecord(urecord_t *ur) ur->aor.len, ur->aor.s, (aortype==1)?"":"@", (aortype==1)?0:ul_ka_domain.len, (aortype==1)?"":ul_ka_domain.s, + fastrand(), my_pid(), _ul_ka_counter, bcnt, ul_ka_method.len, ul_ka_method.s); if(kabuf_len<=0 || kabuf_len>=ULKA_BUF_SIZE) {

1 0

git:master:03dffaad: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 24 Aug '22

24 Aug '22

Module: kamailio Branch: master Commit: 03dffaad07952568bd40e22d5b23aaa4bcfe613a URL: https://github.com/kamailio/kamailio/commit/03dffaad07952568bd40e22d5b23aaa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-08-24T09:31:46+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/03dffaad07952568bd40e22d5b23aaa… Patch: https://github.com/kamailio/kamailio/commit/03dffaad07952568bd40e22d5b23aaa… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index 28bc21c69a..4a1f805154 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -694,8 +694,11 @@ xavi_child_rm("WhatEver", "FoO"); at the index idx becomes the first and the ones before it are at the end of the list. - The first parameter has to be the name of XAVP in the root list. The - second parameter is the index of the XAVP that becomes the first one. + The first parameter has to be the name of XAVP in the root list. + + The second parameter is the index of the XAVP that becomes the first + one (if it is greater than the number of XAVPs, modulo operation is + done first; if it is negative, it counts from the end of the list). The parameters can be with variables.

1 0

git:master:1a33c8b7: pv: updated docs for xavp_lshift()
by Daniel-Constantin Mierla 24 Aug '22

24 Aug '22

Module: kamailio Branch: master Commit: 1a33c8b7c70e7f629868d926965ec456bf2eecae URL: https://github.com/kamailio/kamailio/commit/1a33c8b7c70e7f629868d926965ec45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-24T09:18:08+02:00 pv: updated docs for xavp_lshift() --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1a33c8b7c70e7f629868d926965ec45… Patch: https://github.com/kamailio/kamailio/commit/1a33c8b7c70e7f629868d926965ec45… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 409ecaa4dac..30b09eab807 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -747,8 +747,12 @@ xavi_child_rm("WhatEver", "FoO"); </para> <para> The first parameter has to be the name of XAVP in the root list. + </para> + <para> The second parameter is the index of the XAVP that becomes the - first one. + first one (if it is greater than the number of XAVPs, modulo + operation is done first; if it is negative, it counts from the + end of the list). </para> <para> The parameters can be with variables.

1 0

[kamailio/kamailio] core: added parser mode check (PR #3226)
by korayvt 23 Aug '22

23 Aug '22

#### 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/3226 -- Commit Summary -- * core: added parser mode check -- File Changes -- M src/core/parser/msg_parser.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3226.patch https://github.com/kamailio/kamailio/pull/3226.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3226 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3226(a)github.com>

2 2

git:master:4598f0a0: core: added parser mode check
by Daniel-Constantin Mierla 23 Aug '22

23 Aug '22

Module: kamailio Branch: master Commit: 4598f0a0df90ad81e192be55a89fbd5cca52a40e URL: https://github.com/kamailio/kamailio/commit/4598f0a0df90ad81e192be55a89fbd5… Author: korayvt <koray.vatansever(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-23T14:05:19+02:00 core: added parser mode check --- Modified: src/core/parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/4598f0a0df90ad81e192be55a89fbd5… Patch: https://github.com/kamailio/kamailio/commit/4598f0a0df90ad81e192be55a89fbd5… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 6455c9e5393..7a3855531ed 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -623,9 +623,11 @@ int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int skip: msg->unparsed=tmp; - if(msg->headers==NULL) { - /* nothing parsed - invalid input sip message */ - goto error1; + if(ksr_sip_parser_mode & KSR_SIP_PARSER_MODE_STRICT) { + if(msg->headers==NULL) { + /* nothing parsed - invalid input sip message */ + goto error1; + } } /* restore original flags */ msg->parsed_flag |= orig_flag;

1 0

[kamailio/kamailio] Korayvt/parse headers change (PR #3224)
by korayvt 23 Aug '22

23 Aug '22

#### 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 1

[kamailio/kamailio] pv: add monotonic clock to TimeVal pseudovariable (PR #3191)
by Matteo 23 Aug '22

23 Aug '22

#### 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>

2 5

git:master:5d09caf0: pv: add monotonic clock to TimeVal pseudovariable
by Henning Westerholt 23 Aug '22

23 Aug '22

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 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev