sr-dev

sr-dev@lists.kamailio.org

23 participants
45190 discussions

git:master:ecd906da: lcr: updates for the new t field names
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: ecd906dabbc5dc19d0fabb35d22320e2ba3fccf0 URL: https://github.com/kamailio/kamailio/commit/ecd906dabbc5dc19d0fabb35d22320e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 lcr: updates for the new t field names --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ecd906dabbc5dc19d0fabb35d22320e… Patch: https://github.com/kamailio/kamailio/commit/ecd906dabbc5dc19d0fabb35d22320e… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 80b62f5d4c..a581c0b349 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2830,8 +2830,8 @@ static void ping_callback(struct cell *t, int type, struct tmcb_params *ps) /* SIP URI is taken from the Transaction. * Remove the "To: <" (s+5) and the trailing >+new-line (s - 5 (To: <) * - 3 (>\r\n)). */ - uri.s = t->to.s + 5; - uri.len = t->to.len - 8; + uri.s = t->to_hdr.s + 5; + uri.len = t->to_hdr.len - 8; LM_DBG("OPTIONS %.*s finished with code <%d>\n", uri.len, uri.s, ps->code);

1 0

git:master:734fd291: sca: updates for the new t field names
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: 734fd2910cd437205da870ad1e329eaefe2f043a URL: https://github.com/kamailio/kamailio/commit/734fd2910cd437205da870ad1e329ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 sca: updates for the new t field names --- Modified: src/modules/sca/sca_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/734fd2910cd437205da870ad1e329ea… Patch: https://github.com/kamailio/kamailio/commit/734fd2910cd437205da870ad1e329ea… --- diff --git a/src/modules/sca/sca_notify.c b/src/modules/sca/sca_notify.c index 04638ba7675..271e549f5c6 100644 --- a/src/modules/sca/sca_notify.c +++ b/src/modules/sca/sca_notify.c @@ -74,8 +74,8 @@ static void sca_notify_reply_cb( } return; - if(sca_uri_extract_aor(&t->to, &to_aor) < 0) { - LM_ERR("Failed to extract AoR from %.*s\n", STR_FMT(&t->to)); + if(sca_uri_extract_aor(&t->to_hdr, &to_aor) < 0) { + LM_ERR("Failed to extract AoR from %.*s\n", STR_FMT(&t->to_hdr)); return; } // t->to is the entire To header: "To: sip:....", so move to_aor.s ahead

1 0

git:master:2bd1227b: tm: keep shortcut the cseq header method
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: 2bd1227b2440dd376c18e6c964f569e0e9ba4730 URL: https://github.com/kamailio/kamailio/commit/2bd1227b2440dd376c18e6c964f569e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 tm: keep shortcut the cseq header method --- Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/2bd1227b2440dd376c18e6c964f569e… Patch: https://github.com/kamailio/kamailio/commit/2bd1227b2440dd376c18e6c964f569e… --- diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index fdf80fcb43..5ebba9b0fc 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -372,8 +372,11 @@ typedef struct cell str cseq_hdr_n; str to_hdr; + /* shortcuts inside above fields */ str callid_val; str cseq_num; + str cseq_met; + /* method shortcut -- for local transactions, pointer to * outbound buffer, for proxies transactions pointer to * original message; needed for reply matching */ diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index f4f929a811..696dfacd0a 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1649,6 +1649,9 @@ static inline void init_new_t(struct cell *new_cell, struct sip_msg *p_msg) new_cell->cseq_num.s = get_cseq(shm_msg)->number.s; new_cell->cseq_num.len = get_cseq(shm_msg)->number.len; trim(&new_cell->cseq_num); + new_cell->cseq_met.s = get_cseq(shm_msg)->method.s; + new_cell->cseq_met.len = get_cseq(shm_msg)->method.len; + trim(&new_cell->cseq_met); new_cell->method=new_cell->uas.request->first_line.u.request.method; if (p_msg->REQ_METHOD==METHOD_INVITE){ diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 4de65ffcf3..2e053341b1 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1498,6 +1498,9 @@ static inline char* print_cseq(char* w, str* cseq, str* method, struct cell* t) t->cseq_num.s = t->cseq_hdr_n.s + CSEQ_LEN; t->cseq_num.len = cseq->len; trim(&t->cseq_num); + t->cseq_met.s = t->cseq_hdr_n.s + CSEQ_LEN + cseq->len + 1; + t->cseq_met.len = method->len; + trim(&t->cseq_met); return w; } diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index 3f3b7c3761..f35bf345f8 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -193,6 +193,9 @@ int uac_refresh_shortcuts(tm_cell_t *tcell, int branch, char *buf, int buf_len) tcell->cseq_num.s = cs->number.s; tcell->cseq_num.len = cs->number.len; trim(&tcell->cseq_num); + tcell->cseq_met.s = cs->method.s; + tcell->cseq_met.len = cs->method.len; + trim(&tcell->cseq_met); LM_DBG("cseq: [%.*s]\n", tcell->cseq_hdr_n.len, tcell->cseq_hdr_n.s); lreq.buf=0;

1 0

git:master:927a2451: dispatcher: updates for the new t field names
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: 927a2451e084e886d2548fdae3f5f4cd3abd0a4b URL: https://github.com/kamailio/kamailio/commit/927a2451e084e886d2548fdae3f5f4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 dispatcher: updates for the new t field names --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/927a2451e084e886d2548fdae3f5f4c… Patch: https://github.com/kamailio/kamailio/commit/927a2451e084e886d2548fdae3f5f4c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d79fb7a6d3d..484322f0ec7 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3613,8 +3613,8 @@ static void ds_options_callback( /* The SIP-URI is taken from the Transaction. * Remove the "To: <" (s+5) and the trailing >+new-line (s - 5 (To: <) * - 3 (>\r\n)). */ - uri.s = t->to.s + 5; - uri.len = t->to.len - 8; + uri.s = t->to_hdr.s + 5; + uri.len = t->to_hdr.len - 8; LM_DBG("OPTIONS-Request was finished with code %d (to %.*s, group %d)\n", ps->code, uri.len, uri.s, group); if (ds_ping_latency_stats) {

1 0

git:master:8f39d0ff: keepalive: updates for the new t field names
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: 8f39d0ff741a3ba5819c6c0f96b8f575d30ab770 URL: https://github.com/kamailio/kamailio/commit/8f39d0ff741a3ba5819c6c0f96b8f57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 keepalive: updates for the new t field names --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/8f39d0ff741a3ba5819c6c0f96b8f57… Patch: https://github.com/kamailio/kamailio/commit/8f39d0ff741a3ba5819c6c0f96b8f57… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index df59553392f..ea16dfdc000 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -120,8 +120,8 @@ static void ka_options_callback( shm_free(uuid); ka_unlock_destination_list(); - uri.s = t->to.s + 5; - uri.len = t->to.len - 8; + uri.s = t->to_hdr.s + 5; + uri.len = t->to_hdr.len - 8; LM_DBG("OPTIONS request was finished with code %d (to %.*s)\n", ps->code, ka_dest->uri.len, ka_dest->uri.s); //uri.len, uri.s);

1 0

git:master:8d69c0d6: tm: rename shortcuts to from/to/callid/cseq headers
by Daniel-Constantin Mierla 31 Mar '23

31 Mar '23

Module: kamailio Branch: master Commit: 8d69c0d68347198ccaea57a8ac4eeb040d19287a URL: https://github.com/kamailio/kamailio/commit/8d69c0d68347198ccaea57a8ac4eeb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-31T18:24:24+02:00 tm: rename shortcuts to from/to/callid/cseq headers - reflect better that they are with header names - new fields to point to callid value and cseq number to facilitate use of them directly without new parsing or printing with header names --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_stats.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/8d69c0d68347198ccaea57a8ac4eeb0… Patch: https://github.com/kamailio/kamailio/commit/8d69c0d68347198ccaea57a8ac4eeb0…

1 0

[kamailio/kamailio] [Possible bug] Strartup issues (Issue #3410)
by Michal D. 31 Mar '23

31 Mar '23

### Environment - **OS**: Debian 11 (64-bit) ### Description While attempting to start kamailio thu the `kamctl start` command, I had recieved a following output in the terminal: **Note**: I had edited the PID_FILE variable and had set the value to: /run/kamailio.pid ``` -e database engine 'SQLITE' loaded -e Control engine 'RPCFIFO' loaded -e \E[37;33mINFO: Starting Kamailio : -e \E[37;31mERROR: PID file /run/kamailio.pid does not exist -- Kamailio start failed ``` In my opinion, it's strange that the server complains about missing PID file, while attempting to run it and no other Kamailio instance is running -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3410 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3410(a)github.com>

2 2

[kamailio/kamailio] userloc: change data type of id field to BIGINT (PR #3407)
by Julius Flohr 30 Mar '23

30 Mar '23

As discussed on the mailinglist [1] the `id` field of the location database in the `userloc` module has the data type `INT(10)`. This can be too small for large long running installations of kamailio. This changes the data type of the `id` field from `INT(10)` to `BIGINT` [1]: https://lists.kamailio.org/mailman3/hyperkitty/list/sr-dev@lists.kamailio.o… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3407 -- Commit Summary -- * userloc: change data type of id field to BIGINT -- File Changes -- M src/modules/p_usrloc/location.sql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3407.patch https://github.com/kamailio/kamailio/pull/3407.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3407 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3407(a)github.com>

3 4

[kamailio/kamailio] core: fix a seg while t_continue with nats module (PR #3396)
by Seven Du 30 Mar '23

30 Mar '23

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  segfault ``` #0 0x0000ffffb9934840 in cfg_update_local (no_cbs=0) at ../../core/cfg/cfg_struct.h:366 366 cfg_child_cb = cfg_child_cb->next; (gdb) print cfg_child_cb $1 = (cfg_child_cb_t *) 0x0 ``` example lua: ``` function ksr_route_nats() KSR.tm.t_newtran() local tindex = KSR.pv.gete("$T(id_index)") local tlabel = KSR.pv.gete("$T(id_label)") KSR.tmx.t_suspend() local req = { jsonrpc = "2.0", method = "route", id = tindex .. ':' .. tlabel, params = { from = KSR.pv.gete("$fu"), to = KSR.pv.gete("$tu"), } } local rpc = cjson.encode(req) KSR.info("rpc: " .. rpc .. "\n") KSR.nats.publish("cn.xswitch.ctrl.route", rpc) KSR.x.exit(); end function handle_nats_response(data) msg = cjson.decode(data) if (not msg) or (not msg.id) then return end KSR.info("========= msg.id: " .. msg.id .. "\n") if not msg.result then KSR.error("response has no result\n") return end tindex, tlabel = msg.id:match("(.+):(.+)") if tindex and tlabel then KSR.pv.sets('$var(nats_response)', data) KSR.tmx.t_continue(tindex, tlabel, 'ksr_nats_continue') end end ``` I'm not sure if it's the proper fix, but this pr fixed the seg. Thanks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3396 -- Commit Summary -- * core: fix a seg while t_continue with nats module -- File Changes -- M src/core/cfg/cfg_struct.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3396.patch https://github.com/kamailio/kamailio/pull/3396.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3396 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3396(a)github.com>

4 7

[kamailio/kamailio] tcpops: added tcp_get_conid() for kemi (PR #3402)
by Muhammad Shahzad Shafi 30 Mar '23

30 Mar '23

#### 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  In `tcpops` module, the method `tcp_get_conid()` was missing which may be needed to trace, track and log TCP connections, especially for UDP to TCP reply route in KEMI. The patch is tested to work with `master` and `5.6` and above branches. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3402 -- Commit Summary -- * tcpops: added tcp_get_conid() for kemi -- File Changes -- M src/modules/tcpops/tcpops_mod.c (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3402.patch https://github.com/kamailio/kamailio/pull/3402.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3402 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3402(a)github.com>

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev