sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
279 discussions

git:master:a770c495: dialog: added modparam dlg_ctxiuid_mode to control when iuid is set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a770c4957a31c143a29c68cb71e705c3f9cfcbad URL: https://github.com/kamailio/kamailio/commit/a770c4957a31c143a29c68cb71e705c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-26T11:24:30+02:00 dialog: added modparam dlg_ctxiuid_mode to control when iuid is set --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/a770c4957a31c143a29c68cb71e705c… Patch: https://github.com/kamailio/kamailio/commit/a770c4957a31c143a29c68cb71e705c… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 8eb9f78eec..83a10b3b56 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -154,6 +154,7 @@ str dlg_xavp_cfg = {0}; int dlg_ka_timer = 0; int dlg_ka_interval = 0; int dlg_clean_timer = 90; +int dlg_ctxiuid_mode = 0; str dlg_lreq_callee_headers = {0}; @@ -361,6 +362,8 @@ static param_export_t mod_params[]={ { "dlg_filter_mode", INT_PARAM, &dlg_filter_mode }, { "bye_early_code", PARAM_INT, &bye_early_code }, { "bye_early_reason", PARAM_STR, &bye_early_reason }, + { "dlg_ctxiuid_mode", PARAM_INT, &dlg_ctxiuid_mode }, + { 0,0,0 } }; diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 794aa7c7d2..81525de21b 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -72,6 +72,7 @@ extern int dlg_event_rt[DLG_EVENTRT_MAX]; extern int dlg_wait_ack; extern int dlg_enable_dmq; extern int dlg_filter_mode; +extern int dlg_ctxiuid_mode; int spiral_detected = -1; extern struct rr_binds d_rrb; /*!< binding to record-routing module */ @@ -91,6 +92,9 @@ static unsigned int CURR_DLG_ID = 0xffffffff; /*!< current dialog id */ /*! separator inside the record-route paramter */ #define DLG_SEPARATOR '.' +/*! flags for dlg_ctxiuid */ +#define DLG_CTXIUID_MODE_CANCEL 1 + int dlg_set_tm_callbacks(tm_cell_t *t, sip_msg_t *req, dlg_cell_t *dlg, int mode); int dlg_set_tm_waitack(tm_cell_t *t, dlg_cell_t *dlg); @@ -1258,9 +1262,10 @@ dlg_cell_t *dlg_lookup_msg_dialog(sip_msg_t *msg, unsigned int *dir) msg->callid->body.len, msg->callid->body.s); return NULL; } - if(msg->first_line.u.request.method_value == METHOD_CANCEL) { - dlg_set_ctx_iuid(dlg); - } + if((dlg_ctxiuid_mode & DLG_CTXIUID_MODE_CANCEL) && IS_SIP_REQUEST(msg) + && (msg->first_line.u.request.method_value == METHOD_CANCEL)) { + dlg_set_ctx_iuid(dlg); + } if(dir) *dir = vdir; return dlg; }

2 years, 2 months

git:master:d7e8ae72: core: dprint - simplified sip msg check

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d7e8ae72a0258aa6c3bcf850ea410a929da003cb URL: https://github.com/kamailio/kamailio/commit/d7e8ae72a0258aa6c3bcf850ea410a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-26T10:15:58+02:00 core: dprint - simplified sip msg check --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/d7e8ae72a0258aa6c3bcf850ea410a9… Patch: https://github.com/kamailio/kamailio/commit/d7e8ae72a0258aa6c3bcf850ea410a9… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index f4780bb4d4..ff63fd9ff1 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -504,7 +504,7 @@ void log_prefix_set(sip_msg_t *msg) log_callid_set(msg); if(log_prefix_pvs == NULL) return; - if(msg==NULL || !(IS_SIP(msg) || IS_SIP_REPLY(msg))) { + if(msg==NULL || !IS_SIP_MSG(msg)) { log_prefix_val = NULL; return; }

2 years, 2 months

git:master:02b960d8: core: parse - added IS_SIP_MSG() macro to check if message type is SIP

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 02b960d84d479b001cf94b2b53063deca1d7256d URL: https://github.com/kamailio/kamailio/commit/02b960d84d479b001cf94b2b53063de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-26T10:15:22+02:00 core: parse - added IS_SIP_MSG() macro to check if message type is SIP - defined also IS_SIP_REQUEST() same as IS_SIP() but with more explicit name for detecting SIP requests --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/02b960d84d479b001cf94b2b53063de… Patch: https://github.com/kamailio/kamailio/commit/02b960d84d479b001cf94b2b53063de… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 8b44ce4159..595c1be895 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -147,11 +147,20 @@ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ (((req)->first_line.type == SIP_REQUEST) && \ ((req)->first_line.flags & FLINE_FLAG_PROTO_SIP)) +/* sip request */ +#define IS_SIP_REQUEST(req) \ + (((req)->first_line.type == SIP_REQUEST) && \ + ((req)->first_line.flags & FLINE_FLAG_PROTO_SIP)) + /* sip reply */ #define IS_SIP_REPLY(rpl) \ (((rpl)->first_line.type == SIP_REPLY) && \ ((rpl)->first_line.flags & FLINE_FLAG_PROTO_SIP)) +/* sip message */ +#define IS_SIP_MSG(req) \ + ((req)->first_line.flags & FLINE_FLAG_PROTO_SIP) + /* http request */ #define IS_HTTP(req) \ (((req)->first_line.type == SIP_REQUEST) && \

2 years, 2 months

git:master:654f22a0: dialog: set context iuid for CANCEL requests to let isflagset function return the right value in case a dialog flag was previously set on the call

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 654f22a03e874f86c4b2b2d29eb969a1be3bb25e URL: https://github.com/kamailio/kamailio/commit/654f22a03e874f86c4b2b2d29eb969a… Author: David Escartin <descartin(a)sonoc.io> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-26T09:49:42+02:00 dialog: set context iuid for CANCEL requests to let isflagset function return the right value in case a dialog flag was previously set on the call --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/654f22a03e874f86c4b2b2d29eb969a… Patch: https://github.com/kamailio/kamailio/commit/654f22a03e874f86c4b2b2d29eb969a… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 39f1f83dd7..794aa7c7d2 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1258,6 +1258,9 @@ dlg_cell_t *dlg_lookup_msg_dialog(sip_msg_t *msg, unsigned int *dir) msg->callid->body.len, msg->callid->body.s); return NULL; } + if(msg->first_line.u.request.method_value == METHOD_CANCEL) { + dlg_set_ctx_iuid(dlg); + } if(dir) *dir = vdir; return dlg; }

2 years, 2 months

git:master:a9cf4577: tm: new inter-module API function t_find(...)

by Daniel-Constantin Mierla

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;

2 years, 2 months

[kamailio/kamailio] Make usrloc keepalive call-id more random (Issue #3225)

by Matteo

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

2 years, 2 months

git:master:721daf5c: usrloc: adde random and pid to call-id for keepalive requests

by Daniel-Constantin Mierla

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) {

2 years, 2 months

git:master:03dffaad: modules: readme files regenerated - pv ... [skip ci]

by Kamailio Dev

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.

2 years, 2 months

git:master:1a33c8b7: pv: updated docs for xavp_lshift()

by Daniel-Constantin Mierla

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.

2 years, 2 months

[kamailio/kamailio] core: added parser mode check (PR #3226)

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/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 years, 2 months

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