sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
252 discussions

[kamailio/kamailio] ERROR cfgtrace:dbg_cfg_trace() (Issue #3821)

by happytulubi

May I ask what the problem is? It prompts an error but does not affect the program's operation. Is it that the configuration file and the deployed version are inconsistent? 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=706 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=695 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=695 a=16 n=if 13(682) INFO: <script>: Call from Websocket endpoint at the DURI {sip:117.80.229.36:15060} for callee {3008} 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=691 a=16 n=if 13(682) ERROR: *** cfgtrace:dbg_cfg_trace(): branch_route=[MANAGE_BRANCH] c=[/usr/local/etc/kamailio/kamailio.cfg] l=685 a=25 n=has_body Here is the code for my kamailio.cfg section branch_route[MANAGE_BRANCH]{ xlog("L_INFO","Call to ru:{$ru} '$du'/'$proto'\n"); if(($du=~"transport=ws") || ($du=~"transport=wss")){ if ($du=~"transport=tls") { #sdp_remove_media("video"); xlog("L_INFO","Call to TLS endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { rtpengine_manage("record-call=off metadata=6:$ci force trust-address replace-origin replace-session-connection UDP/TLS/RTP/SAVPF"); } t_on_reply("REPLY_FROM_TLS"); $fs="tls:MY_IP_ADDR:MY_WSS_PORT"; } else if ($du=~"transport=ws") { xlog("L_INFO","Call to Websocket endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { route(GET_REAL_IP_FOR_RTPENGINE); #rtpengine_manage("record-call=off metadata=7:$ci replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=7:$ci replace-origin replace-session-connection rtcp-mux-accept rtcp-mux-offer DTLS=passive SDES-off UDP/TLS/RTP/SAVPF"); } t_on_reply("REPLY_FROM_WS"); $du = $du + ";transport=ws"; $fs="tcp:MY_IP_ADDR:MY_WS_PORT"; } }else { if ($proto=~ "tls") { #sdp_remove_media("video"); xlog("L_INFO","Call from WSS endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { rtpengine_manage("record-call=off metadata=8:$ci trust-address replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP"); } xlog("L_INFO","media adress is $(du{s.select,1,:})\n"); t_on_reply("REPLY_TO_TLS"); } else if ($proto =~ "ws"){ xlog("L_INFO","Call from Websocket endpoint at the DURI {$du} for callee {$tU}\n"); if (has_body('application/sdp')) { route(GET_REAL_IP_FOR_RTPENGINE); #rtpengine_manage("record-call=off metadata=9:$ci replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=9:$ci replace-origin replace-session-connection DTLS=passive ICE=remove RTP/AVP"); } xlog("L_INFO","media adress is $(du{s.select,1,:})\n"); t_on_reply("REPLY_TO_WS"); } if (($proto=~ "udp") || ($proto=~"tcp")) { #sdp_remove_media("video"); xlog("L_INFO","UDP Branch is {$du} for {$tU}\n"); # $avp(mediaAddr) = ''; if ( has_body('application/sdp')) { #rtpengine_manage("record-call=off metadata=10:$ci replace-origin replace-session-connection media-address=$avp(mediaAddr)"); rtpengine_manage("record-call=off metadata=10:$ci replace-origin replace-session-connection"); } t_on_reply("STANDART"); } } xlog("L_INFO", "t_on_reply set\n"); if is_method("BYE|CANCEL") { rtpengine_manage(); } } -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3821 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3821(a)github.com>

7 months

[kamailio/kamailio] tools/kemi: escape docstrings when required (PR #3824)

by tsearle

some of the documentation contains \ which need escaping   #### 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 - [ ] 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/3824 -- Commit Summary -- * tools/kemi: escape docstrings when required -- File Changes -- M misc/tools/kemi/python_mock/kemi_mock.py (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3824.patch https://github.com/kamailio/kamailio/pull/3824.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3824 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3824(a)github.com>

7 months

git:master:999d0c65: tools/kemi: escape docstrings when required (#3824)

by GitHub

Module: kamailio Branch: master Commit: 999d0c65402c99491683d694d77a01a5c1f91ecf URL: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-24T11:28:49+02:00 tools/kemi: escape docstrings when required (#3824) some of the documentation contains \ which need escaping --- Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… Patch: https://github.com/kamailio/kamailio/commit/999d0c65402c99491683d694d77a01a… --- diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 145fcb34b3a..918551a1887 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -129,7 +129,7 @@ def generate_function_doc(module_name, func, prefix): print(prefix + "\t\"\"\"") documentation_lines = documentation[module_name]["functions"][function_prefix].split("\n") for line in documentation_lines: - print(prefix + "\t" + line) + print(prefix + "\t" + line.replace("\\", "\\\\\\\\")) print(prefix + "\t\"\"\"") break

7 months

git:master:2cc62133: regex: allocate pcres array

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2cc62133db4f6875f55e73e044f37dafbb2274c2 URL: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T12:08:30+02:00 regex: allocate pcres array - GH #3812 --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… Patch: https://github.com/kamailio/kamailio/commit/2cc62133db4f6875f55e73e044f37da… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 8e8c1645f0e..4bb4d7cdcee 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -462,6 +462,15 @@ static int load_pcres(int action) } shm_free(pcres); } + + if(pcres == NULL) { + if((pcres = shm_malloc(sizeof(pcre2_code *) * num_pcres_tmp)) == 0) { + LM_ERR("no more memory for pcres\n"); + goto err; + } + memset(pcres, 0, sizeof(pcre2_code *) * num_pcres_tmp); + } + *num_pcres = num_pcres_tmp; *pcres = *pcres_tmp; *pcres_addr = pcres;

7 months

git:master:84517c14: regex: init globals for safer shutdown on failure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 84517c14ca38a8371c67b858077a42019c2217a8 URL: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T11:49:23+02:00 regex: init globals for safer shutdown on failure --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… Patch: https://github.com/kamailio/kamailio/commit/84517c14ca38a8371c67b858077a420… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index e7aaada852d..8e8c1645f0e 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -68,7 +68,7 @@ gen_lock_t *reload_lock; /* * Module exported parameter variables */ -static char *file; +static char *file = NULL; static int max_groups = MAX_GROUPS; static int group_max_size = GROUP_MAX_SIZE; static int pcre_caseless = 0; @@ -83,9 +83,9 @@ static int pcre_extended = 0; static pcre2_general_context *pcres_gctx = NULL; static pcre2_match_context *pcres_mctx = NULL; static pcre2_compile_context *pcres_ctx = NULL; -static pcre2_code **pcres; -static pcre2_code ***pcres_addr; -static int *num_pcres; +static pcre2_code **pcres = NULL; +static pcre2_code ***pcres_addr = NULL; +static int *num_pcres = NULL; static int pcre_options = 0x00000000;

7 months

[kamailio/kamailio] TSILO: ts_append_to(): transaction 11743:1310842517: error updating dset (-1) (Issue #3782)

by vteliatnykov

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>

7 months

[kamailio/kamailio] Misleading source IP of 1.0.0.127 in event routes (Issue #3817)

by Jukka Väisänen

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

7 months

git:master:66b3c04a: core: fmsg - parse loopback ip when initializing faked msg structure

by Daniel-Constantin Mierla

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; }

7 months

git:master:f5c05a68: pv: use global tcp connection callback for event route on $conid

by Daniel-Constantin Mierla

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

7 months

git:master:d114d117: core: tcp - set a global shortcut to tcp connection for event route

by Daniel-Constantin Mierla

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"); }

7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024