sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
257 discussions

[kamailio/kamailio] TSILO: ts_append_to(): transaction 11743:1310842517: error updating dset (-1) (Issue #3782)
by vteliatnykov 23 Apr '24

23 Apr '24

After the transaction was suspended, 1st user registered, got INVITE message, there is 2nd user wakes up and send REGISTER. Kamailio check if transaction suspended (for 2nd user, it is not suspended anymore), and checks if there is stored transaction. So, for 2nd user we have stored transaction, then it should append new branch. ts_append failed. if ($var(suspended) == 0) { if ($var(stored)) { # no suspended INVITE (i.e. there was at least one # registered contact for target) and 'stored' set # (i.e. ongoing transaction) -> this newly just # registered contact needs alerting. ts_append("location", "sip:$avp(extension)@LOCALVIRTUALIP"); xinfo("appending branches for sip:$avp(extension)@LOCALVIRTUALIP, result $rc"); } else { xinfo("no suspended transactions for $tu"); } return; } Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1339] <script>: -----------122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1348] <script>: var(suspended)=0, tsilo=>suspended::122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1349] <script>: var(stored)=1, tsilo=>stored::122583d4102d400d8565c6f48d217b8d Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: ERROR: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1357] tsilo [ts_append.c:152]: ts_append_to(): transaction 11743:1310842517: error updating dset (-1) Mar 10 21:07:11 stage-webrtc-kama-01 /usr/sbin/kamailio[4067482]: INFO: [t3jutj5k1na4eir1o8pvk9 REGISTER WAKE_SUSPENDED:1:1359] <script>: appending branches for sip:1000@10.160.201.190, result 1 At this moment we have active transaction `{ cell: 0x7f313d43cda8 tindex: 11743 tlabel: 1310842517 method: INVITE from: From: "9988" <sip:9988@10.156.0.6>;tag=as081c0936 to: To: <sip:1000@10.160.201.190:5070> callid: Call-ID: 66d9dace125df36915783fb379f4e3dd@10.156.0.6:5060 cseq: CSeq: 102 uas_request: yes tflags: 69 outgoings: 3 ref_count: 1 lifetime: 5402832 } ` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3782 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3782(a)github.com>

2 3

[kamailio/kamailio] Misleading source IP of 1.0.0.127 in event routes (Issue #3817)
by Jukka Väisänen 23 Apr '24

23 Apr '24

### Description Event routes that are executed without a real SIP message available use the default "fake SIP message". The fake message has a source IPv4 address of 1.0.0.127 which belongs to CloudFlare (1.0.0.0/24).. and this led us to believe that traffic is coming from CF but could not find the messages on tcpdumps or HEP exports. Had a bit of a wild goose chase there trying to find the source. I believe the original intention has been to use 127.0.0.1 loopback address but the bytes are reversed at: https://github.com/kamailio/kamailio/blob/master/src/core/fmsg.c#L78 It would be best to change this address to well ANYTHING that doesn't imply CloudFlare is pinging you 😂 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3817 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3817(a)github.com>

3 4

git:master:66b3c04a: core: fmsg - parse loopback ip when initializing faked msg structure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 66b3c04a9653425b1602c82dd2456a7eb7cf59d1 URL: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T11:19:30+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… Patch: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 7a4f9ba87e5..b30ca9f69cf 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -25,6 +25,7 @@ #include "dprint.h" #include "globals.h" #include "dset.h" +#include "resolve.h" #include "fmsg.h" @@ -57,6 +58,8 @@ static void faked_msg_buf_init(void) static int faked_msg_init_new(sip_msg_t *fmsg) { + str loip = str_init("127.0.0.1"); + faked_msg_buf_init(); /* init faked sip msg */ @@ -75,13 +78,9 @@ static int faked_msg_init_new(sip_msg_t *fmsg) fmsg->rcv.proto = PROTO_UDP; fmsg->rcv.src_port = 5060; - fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; - fmsg->rcv.src_ip.af = AF_INET; - fmsg->rcv.src_ip.len = 4; + str2ipbuf(&loip, &fmsg->rcv.src_ip); fmsg->rcv.dst_port = 5060; - fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; - fmsg->rcv.dst_ip.af = AF_INET; - fmsg->rcv.dst_ip.len = 4; + str2ipbuf(&loip, &fmsg->rcv.dst_ip); return 0; }

1 0

git:master:f5c05a68: pv: use global tcp connection callback for event route on $conid
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: f5c05a68ae72881ab0691bb8488112356fc67c79 URL: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:42:02+02:00 pv: use global tcp connection callback for event route on $conid --- Modified: src/modules/pv/pv_core.c Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… Patch: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 40557ba4628..b10b7513a6f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2927,6 +2927,13 @@ int pv_get_tcpconn_id(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(msg == NULL) return -1; + /* use first the connection set for event_route[tcp:...] */ + con = ksr_tcpcon_evcb_get(); + if(con != NULL) { + return pv_get_sintval(msg, param, res, con->id); + } + + /* find connection from sip message structure */ if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) return pv_get_null(msg, param, res); diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 97068c627bb..9c648c1f2a3 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,6 +248,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; + int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git:master:d114d117: core: tcp - set a global shortcut to tcp connection for event route
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: d114d11724dc4157e7e5809504531d26da6bcc57 URL: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:36:35+02:00 core: tcp - set a global shortcut to tcp connection for event route --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… Patch: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 5b579b2ffb9..57dff5a291b 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -434,4 +434,6 @@ typedef struct ws_event_info int id; } ws_event_info_t; +tcp_connection_t *ksr_tcpcon_evcb_get(void); + #endif diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 957a9b97c0f..2456459cfa2 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3670,6 +3670,12 @@ int _tcpconn_write_nb( return n; } +static tcp_connection_t *_ksr_tcpcon_evcb = NULL; + +tcp_connection_t *ksr_tcpcon_evcb_get(void) +{ + return _ksr_tcpcon_evcb; +} static int tcp_emit_closed_event(struct tcp_connection *con) { @@ -3692,7 +3698,9 @@ static int tcp_emit_closed_event(struct tcp_connection *con) tev.id = con->id; tev.con = con; evp.data = (void *)(&tev); + _ksr_tcpcon_evcb = con; ret = sr_event_exec(SREV_TCP_CLOSED, &evp); + _ksr_tcpcon_evcb = NULL; } else { LM_DBG("no callback registering for handling TCP closed event\n"); }

1 0

git:master:27e3b7f3: tcpops: reworked some debug messages
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81 URL: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:21:20+02:00 tcpops: reworked some debug messages --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… Patch: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 2b767a9470e..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -249,6 +249,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sr_kemi_eng_t *keng = NULL; str *evname; + LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) { rt = -1; keng = sr_kemi_eng_get(); @@ -258,9 +259,10 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) } } else { rt = tcp_closed_routes[tev->reason]; - LM_DBG("event reason id: %d rt: %d\n", tev->reason, rt); - if(rt == -1) + if(rt == -1) { + LM_DBG("event reason id: %d - event route not set\n", tev->reason); return; + } } if(faked_msg_init() < 0) {

1 0

git:master:11e7d71e: core: tcp - keep connection id on event route cb structure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 11e7d71e5c2ee9428298658ed3b9a0f625d40f00 URL: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:19:29+02:00 core: tcp - keep connection id on event route cb structure --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… Patch: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 13301563945..5b579b2ffb9 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -422,6 +422,7 @@ typedef struct tcp_event_info typedef struct tcp_closed_event_info { enum tcp_closed_reason reason; + int id; struct tcp_connection *con; } tcp_closed_event_info_t; diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index b71e7ad37f2..957a9b97c0f 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3689,6 +3689,7 @@ static int tcp_emit_closed_event(struct tcp_connection *con) if(likely(sr_event_enabled(SREV_TCP_CLOSED))) { memset(&tev, 0, sizeof(tcp_closed_event_info_t)); tev.reason = reason; + tev.id = con->id; tev.con = con; evp.data = (void *)(&tev); ret = sr_event_exec(SREV_TCP_CLOSED, &evp);

1 0

git:master:6e6b4f06: xhttp_prom: use %lu for printing pkg fields
by Daniel-Constantin Mierla 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: 6e6b4f06546a0d9ad942847ee745b17a5aeb7f6a URL: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-22T21:54:26+02:00 xhttp_prom: use %lu for printing pkg fields --- Modified: src/modules/xhttp_prom/prom.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… Patch: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index efe111b752a..71accf21845 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -253,7 +253,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) for(; i < pkg_proc_stats_no; i++) { if(prom_body_printf(ctx, "%.*spkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " - "%d %" PRIu64 "\n", + "%lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].used, ts) @@ -263,7 +263,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_available{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].available, ts) @@ -273,7 +273,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_real_used{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].real_used, ts) @@ -283,7 +283,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_total_frags{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_frags, ts) @@ -293,7 +293,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_total_size{pid=\"%u\", rank=\"%d\" " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_size, ts)

1 0

git:master:b96de87a: ipops: define hostname size for ptr structure
by Daniel-Constantin Mierla 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: b96de87ae94db2285d7a5f022c38a746d69ae5ef URL: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-22T21:43:40+02:00 ipops: define hostname size for ptr structure - replace the strncpy with strlen with straight strcpy --- Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… Patch: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 034ec696594..acbe08a4283 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -429,7 +429,7 @@ int ptr_update_pv(str *ip_address, str *name) sr_dns_item_t *dr = NULL; struct sockaddr_in sa; struct sockaddr_in6 sa6; - char hostname[256]; + char hostname[SR_DNS_HOSTNAME_SIZE]; int result; int ip_type; if(ip_address->len > INET6_ADDRSTRLEN) { @@ -499,8 +499,7 @@ int ptr_update_pv(str *ip_address, str *name) } /* Store the hostname in the sr_dns_item_t structure. */ - strncpy(dr->hostname, hostname, strlen(hostname)); - dr->hostname[strlen(hostname)] = '\0'; + strcpy(dr->hostname, hostname); dr->count = 1; LM_DBG("reverse dns PV updated for: %s (%d)\n", dr->r[0].addr, dr->count); diff --git a/src/modules/ipops/ipops_pv.h b/src/modules/ipops/ipops_pv.h index 5e9a19be1da..cede3b4217c 100644 --- a/src/modules/ipops/ipops_pv.h +++ b/src/modules/ipops/ipops_pv.h @@ -27,7 +27,7 @@ #define PV_DNS_ADDR 64 #define PV_DNS_RECS 32 #define SR_DNS_PVIDX 1 - +#define SR_DNS_HOSTNAME_SIZE 256 typedef struct _sr_dns_record { int type; @@ -38,7 +38,7 @@ typedef struct _sr_dns_item { str name; unsigned int hashid; - char hostname[256]; + char hostname[SR_DNS_HOSTNAME_SIZE]; int count; int ipv4; int ipv6;

1 0

[kamailio/kamailio] tools/kemi: add dockstrings to the mocking (PR #3818)
by tsearle 22 Apr '24

22 Apr '24

kemi_mock.py can now optionally consume documentation information generated by the vscode-kamailio-hover project   #### 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) - [ ] 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) - [ ] 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/3818 -- Commit Summary -- * tools/kemi: add dockstrings to the mocking -- File Changes -- M misc/tools/kemi/python_mock/README.md (15) M misc/tools/kemi/python_mock/kemi_mock.py (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3818.patch https://github.com/kamailio/kamailio/pull/3818.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3818 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3818(a)github.com>

1 1

← Newer
1
...
8
9
10
11
12
13
14
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024