sr-dev May 2023

sr-dev@lists.kamailio.org

16 participants
323 discussions

git:master:ab0a2be6: dialplan: fix ki_dp_translate() checks for input/output parameters
by Victor Seva 09 May '23

09 May '23

Module: kamailio Branch: master Commit: ab0a2be6b522c1b48a2442447c24e7ab156e3d4e URL: https://github.com/kamailio/kamailio/commit/ab0a2be6b522c1b48a2442447c24e7a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-09T23:28:04+02:00 dialplan: fix ki_dp_translate() checks for input/output parameters fixes #3447 --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/ab0a2be6b522c1b48a2442447c24e7a… Patch: https://github.com/kamailio/kamailio/commit/ab0a2be6b522c1b48a2442447c24e7a… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index fb57faa55d1..26c68f777fd 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -872,9 +872,12 @@ static int ki_dp_translate(sip_msg_t* msg, int id, str *input_spv, str *output_s if (!msg) return -1; - if (input_spv == NULL || input_spv->s == NULL || input_spv->len <= 0 || - output_spv == NULL || output_spv->s == NULL || output_spv->len <= 0) { - LM_ERR("invalid destination var name for input or output\n"); + if (input_spv != NULL && (input_spv->s == NULL || input_spv->len <= 0)) { + LM_ERR("invalid destination var name for input\n"); + return -1; + } + if (output_spv != NULL && (output_spv->s == NULL || output_spv->len <= 0)) { + LM_ERR("invalid destination var name for output\n"); return -1; }

1 0

git:master:84dbcdb8: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 09 May '23

09 May '23

Module: kamailio Branch: master Commit: 84dbcdb812fce70d6d470050793125698c06d0fd URL: https://github.com/kamailio/kamailio/commit/84dbcdb812fce70d6d4700507931256… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-05-09T20:31:14+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/84dbcdb812fce70d6d4700507931256… Patch: https://github.com/kamailio/kamailio/commit/84dbcdb812fce70d6d4700507931256… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 360577c8d1..92c06d8714 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -745,6 +745,10 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") * socket - the string representing the socket on which the register request was received, as alternative to using the sock_hdr. Used in save(). + * tcpconn_id This can be set with $conid, the TCP connection ID of + the connection the current message. This is useful when calling + save() on a reply route to set the connecion of the original + request. Used in save(). For example. if this parameter is set to 'reg', then the number of maximum contacts can be set in $xavp(reg=>max_contacts). diff --git a/src/modules/tls/README b/src/modules/tls/README index ed3c290803..7198c45529 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -81,7 +81,8 @@ Olle E. Johansson 12.1. tls.info 12.2. tls.list 12.3. tls.options - 12.4. tls.reload + 12.4. tls.kill + 12.5. tls.reload 13. Status @@ -213,7 +214,8 @@ Chapter 1. Admin Guide 12.1. tls.info 12.2. tls.list 12.3. tls.options - 12.4. tls.reload + 12.4. tls.kill + 12.5. tls.reload 13. Status @@ -1641,7 +1643,8 @@ verify_client = optional_no_ca 12.1. tls.info 12.2. tls.list 12.3. tls.options - 12.4. tls.reload + 12.4. tls.kill + 12.5. tls.reload 12.1. tls.info @@ -1665,7 +1668,14 @@ verify_client = optional_no_ca Parameters: * None. -12.4. tls.reload +12.4. tls.kill + + Kill a TLS session by id. + + Parameters: + * None. + +12.5. tls.reload Reload the external TLS configuration file (aka tls.cfg). It does not reload modparam() parameters. Note that existing active TLS connections

1 0

[kamailio/kamailio] dispatcher's question (Issue #3446)
by liuxinfeng123 09 May '23

09 May '23

### Description  ### Expected behavior #### Actual observed behavior #### Debugging Data ``` modparam("dispatcher", "db_url", "mysql://xxxxxxxx/kamailio") modparam("dispatcher", "table_name", "dispatcher") #modparam("dispatcher", "flags", 2) modparam("dispatcher", "ds_probing_mode", 1) modparam("dispatcher", "ds_ping_method", "OPTIONS") modparam("dispatcher", "ds_ping_interval", 3) modparam("dispatcher", "ds_probing_threshold", 1) modparam("dispatcher", "ds_inactive_threshold", 2) modparam("dispatcher", "ds_timer_mode", 1) ``` #### Log Messages  ``` When the back-end gateway is unreachable, run kamctl dispatcher dump to check the flag status of the corresponding gateway. It takes 30 seconds for the flag to change to IP. However, according to my configuration file, ping every three seconds and ping every time fails is changed to inactive,who can help me?Thanks! "SET": { "ID": 1000, "TARGETS": [{ "DEST": { "URI": "sip:xxxxxx:port", "FLAGS": "AP", "PRIORITY": 0, "ATTRS": { "BODY": "weight=100;sockname=zhuanxian;", "DUID": null, "MAXLOAD": 0, "WEIGHT": 100, "RWEIGHT": 0, "SOCKET": null, "SOCKNAME": "zhuanxian", "OBPROXY": null } } ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.2 (x86_64/linux) e292ba 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: e292ba compiled on 10:52:18 May 8 2023 with gcc 10.2.1 ``` * **Operating System**:  ``` Linux HUIJIE-Kamailio-SBC01 5.10.0-22-amd64 #1 SMP Debian 5.10.178-3 (2023-04-22) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3446 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3446(a)github.com>

2 2

[kamailio/kamailio] tls: Add rpc function to kill session by id (PR #3428)
by Stefan Mititelu 09 May '23

09 May '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  Kill a TLS session by moving the TCP connectin to -2 state. Note that it may take few seconds for session to be killed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3428 -- Commit Summary -- * tls: Add rpc function to kill session by id -- File Changes -- M src/modules/tls/doc/rpc.xml (12) M src/modules/tls/tls_rpc.c (35) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3428.patch https://github.com/kamailio/kamailio/pull/3428.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3428 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3428(a)github.com>

3 4

git:master:ad8c6688: tls: Add rpc function to kill session by id
by Daniel-Constantin Mierla 09 May '23

09 May '23

Module: kamailio Branch: master Commit: ad8c6688d43d3d5913efa12ae1a85ef6ee3e162f URL: https://github.com/kamailio/kamailio/commit/ad8c6688d43d3d5913efa12ae1a85ef… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-09T20:24:13+02:00 tls: Add rpc function to kill session by id Note that it may take few seconds for session to be killed. --- Modified: src/modules/tls/doc/rpc.xml Modified: src/modules/tls/tls_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ad8c6688d43d3d5913efa12ae1a85ef… Patch: https://github.com/kamailio/kamailio/commit/ad8c6688d43d3d5913efa12ae1a85ef… --- diff --git a/src/modules/tls/doc/rpc.xml b/src/modules/tls/doc/rpc.xml index 30c67d5c8fe..495fc7b31c2 100644 --- a/src/modules/tls/doc/rpc.xml +++ b/src/modules/tls/doc/rpc.xml @@ -50,6 +50,18 @@ </para></listitem> </itemizedlist> </section> + <section id="tls.r.tls.kill"> + <title><function>tls.kill</function></title> + <para> + Kill a TLS session by id. + </para> + <para>Parameters: </para> + <itemizedlist> + <listitem><para> + None. + </para></listitem> + </itemizedlist> + </section> <section id="tls.r.tls.reload"> <title><function>tls.reload</function></title> <para> diff --git a/src/modules/tls/tls_rpc.c b/src/modules/tls/tls_rpc.c index 566191a8760..c55f45b72d7 100644 --- a/src/modules/tls/tls_rpc.c +++ b/src/modules/tls/tls_rpc.c @@ -275,7 +275,41 @@ static void tls_options(rpc_t* rpc, void* c) ); } +static const char* tls_kill_doc[2] = { + "Kills a tls session, identified via id.", + 0 }; + +static void tls_kill(rpc_t* rpc, void* c) +{ + struct tcp_connection* con; + int i, kill_id = 0; + + if (rpc->scan(c, "d", &kill_id) < 0) { + /* Reply is set automatically by scan upon failure, + * no need to do anything here + */ + return; + } + TCPCONN_LOCK; + for(i = 0; i < TCP_ID_HASH_SIZE; i++) { + for (con = tcpconn_id_hash[i]; con; con = con->id_next) { + if (con->rcv.proto != PROTO_TLS) continue; + if (con->id == kill_id) { + con->state = -2; + con->timeout = get_ticks_raw(); + + TCPCONN_UNLOCK; + + rpc->add(c, "s", "OK"); + return; + } + } + } + TCPCONN_UNLOCK; + + rpc->add(c, "s", "TLS connection id not found"); +} rpc_export_t tls_rpc[] = { @@ -283,5 +317,6 @@ rpc_export_t tls_rpc[] = { {"tls.list", tls_list, tls_list_doc, RET_ARRAY}, {"tls.info", tls_info, tls_info_doc, 0}, {"tls.options",tls_options, tls_options_doc, 0}, + {"tls.kill", tls_kill, tls_kill_doc, 0}, {0, 0, 0, 0} };

1 0

[kamailio/kamailio] registrar: adding tcpconn_id to xavp_cfg (PR #3430)
by Julien Chavanton 09 May '23

09 May '23

3 7

git:master:439a1c74: registrar: use xavp->val.v.l for tcp connection id
by Daniel-Constantin Mierla 09 May '23

09 May '23

Module: kamailio Branch: master Commit: 439a1c7471c562b14d482c691107e88aaf694162 URL: https://github.com/kamailio/kamailio/commit/439a1c7471c562b14d482c691107e88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-09T20:23:16+02:00 registrar: use xavp->val.v.l for tcp connection id Co-authored-by: Bastian Triller <bastian.triller(a)gmail.com> --- Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/439a1c7471c562b14d482c691107e88… Patch: https://github.com/kamailio/kamailio/commit/439a1c7471c562b14d482c691107e88… --- diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 5ccc499787..878f22224b 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -84,7 +84,7 @@ int reg_get_cfg_tcpconnid(void) vavp = xavp_get_child_with_ival(&reg_xavp_cfg, &vname); if(vavp!=NULL) { - n = vavp->val.v.i; + n = (int)vavp->val.v.l; LM_DBG("using tcpconn_id value from xavp: %d\n", n); } }

1 0

git:master:404ccb00: registrar: adding tcpconn_id to xavp_cfg
by Daniel-Constantin Mierla 09 May '23

09 May '23

Module: kamailio Branch: master Commit: 404ccb00ad294b39da58132772881143bc15fa04 URL: https://github.com/kamailio/kamailio/commit/404ccb00ad294b39da5813277288114… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-05-09T20:23:16+02:00 registrar: adding tcpconn_id to xavp_cfg --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/regpv.c Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/404ccb00ad294b39da5813277288114… Patch: https://github.com/kamailio/kamailio/commit/404ccb00ad294b39da5813277288114… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 58647f42e4e..c38c8921f4e 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -798,6 +798,13 @@ modparam("registrar", "reg_callid_avp", "$avp(s:avp)") Used in save(). </para> </listitem> + <listitem> + <para> + <emphasis>tcpconn_id</emphasis> This can be set with $conid, the TCP connection ID of the connection the current message. + This is useful when calling save() on a reply route to set the connecion of the original request. + Used in save(). + </para> + </listitem> </itemizedlist> <para> For example. if this parameter is set to 'reg', then the number diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index 1c764ea96c5..66121608bb4 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -275,6 +275,8 @@ int pv_get_ulc(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &c->instance); break; case 21: /* conid */ + if (c->tcpconn_id > 0) + return pv_get_sintval(msg, param, res, c->tcpconn_id); if (c->sock && (c->sock->proto == PROTO_TCP || c->sock->proto == PROTO_TLS || c->sock->proto == PROTO_WS || c->sock->proto == PROTO_WSS)) return pv_get_sintval(msg, param, res, c->tcpconn_id); break; @@ -664,6 +666,10 @@ int pv_fetch_contacts_helper(sip_msg_t* msg, udomain_t* dt, str* uri, { c0->tcpconn_id = ptr->tcpconn_id; } + if (ptr->tcpconn_id > 0) { + LM_DBG("preset tcpconn_id : %d\n", ptr->tcpconn_id); + c0->tcpconn_id = ptr->tcpconn_id; + } if(ptr0==NULL) { diff --git a/src/modules/registrar/save.c b/src/modules/registrar/save.c index 74d118fd277..5ccc499787a 100644 --- a/src/modules/registrar/save.c +++ b/src/modules/registrar/save.c @@ -71,6 +71,27 @@ extern sruid_t _reg_sruid; static int q_override_msg_id; static qvalue_t q_override_value; +int reg_get_cfg_tcpconnid(void) +{ + int n; + sr_xavp_t *vavp=NULL; + str vname = {"tcpconn_id", 10}; + + n = 0; + + if(reg_xavp_cfg.s!=NULL) + { + vavp = xavp_get_child_with_ival(&reg_xavp_cfg, &vname); + if(vavp!=NULL) + { + n = vavp->val.v.i; + LM_DBG("using tcpconn_id value from xavp: %d\n", n); + } + } + + return n; +} + /*! \brief * Process request that contained a star (*) as a contact, in that case, * we will remove all bindings with the given username @@ -277,6 +298,9 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, } else { ci.tcpconn_id = -1; } + /* if a tcp connectionid is set, use it */ + if (reg_get_cfg_tcpconnid()) + ci.tcpconn_id = reg_get_cfg_tcpconnid(); /* additional info from message */ if (parse_headers(_m, HDR_USERAGENT_F, 0) != -1 && _m->user_agent &&

1 0

[kamailio/kamailio] rtpengine: fix unaligned memory access (PR #3445)
by Victor Seva 09 May '23

09 May '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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #3444 #### Description Make sure the pointers we return from our continuous memory buffer is always 64-bit aligned as it's used not only for strings, but also for structs/objects, and such unaligned memory access is undefined on some archs and flagged as such by ASAN. From https://github.com/sipwise/rtpengine/commit/ade8100d3b10308f1ff63f8cb06fdf2… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3445 -- Commit Summary -- * rtpengine: fix unaligned memory access -- File Changes -- M src/modules/rtpengine/bencode.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3445.patch https://github.com/kamailio/kamailio/pull/3445.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3445 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3445(a)github.com>

1 1

git:master:43ac6b27: rtpengine: fix unaligned memory access
by Victor Seva 09 May '23

09 May '23

Module: kamailio Branch: master Commit: 43ac6b27d7ca7bc522f362c25ebb3c22ab918280 URL: https://github.com/kamailio/kamailio/commit/43ac6b27d7ca7bc522f362c25ebb3c2… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-05-09T15:20:37+02:00 rtpengine: fix unaligned memory access Make sure the pointers we return from our continuous memory buffer is always 64-bit aligned as it's used not only for strings, but also for structs/objects, and such unaligned memory access is undefined on some archs and flagged as such by ASAN. From https://github.com/sipwise/rtpengine/commit/ade8100d3b10308f1ff63f8cb06fdf2… fixes #3444 --- Modified: src/modules/rtpengine/bencode.c --- Diff: https://github.com/kamailio/kamailio/commit/43ac6b27d7ca7bc522f362c25ebb3c2… Patch: https://github.com/kamailio/kamailio/commit/43ac6b27d7ca7bc522f362c25ebb3c2… --- diff --git a/src/modules/rtpengine/bencode.c b/src/modules/rtpengine/bencode.c index 7a4b2ed0da..cca1732624 100644 --- a/src/modules/rtpengine/bencode.c +++ b/src/modules/rtpengine/bencode.c @@ -12,6 +12,8 @@ #define BENCODE_HASH_BUCKETS 31 /* prime numbers work best */ +#define BENCODE_ALLOC_ALIGN 8 + struct __bencode_buffer_piece { char *tail; unsigned int left; @@ -76,7 +78,7 @@ static struct __bencode_buffer_piece *__bencode_piece_new(unsigned int size) { if (size < BENCODE_MIN_BUFFER_PIECE_LEN) size = BENCODE_MIN_BUFFER_PIECE_LEN; - ret = BENCODE_MALLOC(sizeof(*ret) + size); + ret = BENCODE_MALLOC(sizeof(*ret) + size + BENCODE_ALLOC_ALIGN); if (!ret) return NULL; @@ -99,6 +101,7 @@ int bencode_buffer_init(bencode_buffer_t *buf) { static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { struct __bencode_buffer_piece *piece; void *ret; + unsigned int align_size = ((size + BENCODE_ALLOC_ALIGN - 1) / BENCODE_ALLOC_ALIGN) * BENCODE_ALLOC_ALIGN; if (!buf) return NULL; @@ -121,9 +124,12 @@ static void *__bencode_alloc(bencode_buffer_t *buf, unsigned int size) { assert(size <= piece->left); alloc: - piece->left -= size; + if (piece->left >= align_size) + piece->left -= align_size; + else + piece->left = 0; ret = piece->tail; - piece->tail += size; + piece->tail += align_size; return ret; }

1 0

← Newer
1
...
25
26
27
28
29
30
31
32
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2023