sr-dev April 2023

sr-dev@lists.kamailio.org

15 participants
264 discussions

git:master:ccdd2edb: evapi: move clients structure to shm for access from internal workers
by Daniel-Constantin Mierla 04 Apr '23

04 Apr '23

Module: kamailio Branch: master Commit: ccdd2edbeea51f9141654b48d396abe381cd2318 URL: https://github.com/kamailio/kamailio/commit/ccdd2edbeea51f9141654b48d396abe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-04T08:00:51+02:00 evapi: move clients structure to shm for access from internal workers --- Modified: src/modules/evapi/evapi_dispatch.c Modified: src/modules/evapi/evapi_dispatch.h Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ccdd2edbeea51f9141654b48d396abe… Patch: https://github.com/kamailio/kamailio/commit/ccdd2edbeea51f9141654b48d396abe… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index f2aef08abf..35aa62ce69 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -40,6 +40,7 @@ #include "../../core/receive.h" #include "../../core/kemi.h" #include "../../core/fmsg.h" +#include "../../core/mem/shm.h" #include "evapi_dispatch.h" @@ -185,6 +186,27 @@ evapi_env_t* evapi_queue_get(void) } +/** + * + */ +int evapi_clients_init(void) +{ + int i; + + _evapi_clients = (evapi_client_t*)shm_malloc(sizeof(evapi_client_t) + * (EVAPI_MAX_CLIENTS+1)); + if(_evapi_clients==NULL) { + LM_ERR("failed to allocate client structures\n"); + return -1; + } + memset(_evapi_clients, 0, sizeof(evapi_client_t) * EVAPI_MAX_CLIENTS); + for(i=0; i<EVAPI_MAX_CLIENTS; i++) { + _evapi_clients[i].sock = -1; + } + return 0; +} + + /** * */ @@ -728,20 +750,14 @@ int evapi_run_dispatcher(char *laddr, int lport) struct ev_io io_notify; int yes_true = 1; int fflags = 0; - int i; LM_DBG("starting dispatcher processing\n"); - _evapi_clients = (evapi_client_t*)malloc(sizeof(evapi_client_t) - * (EVAPI_MAX_CLIENTS+1)); if(_evapi_clients==NULL) { - LM_ERR("failed to allocate client structures\n"); + LM_ERR("client structures not initialized\n"); exit(-1); } - memset(_evapi_clients, 0, sizeof(evapi_client_t) * EVAPI_MAX_CLIENTS); - for(i=0; i<EVAPI_MAX_CLIENTS; i++) { - _evapi_clients[i].sock = -1; - } + loop = ev_default_loop(0); if(loop==NULL) { @@ -834,7 +850,8 @@ int evapi_run_worker(int prank) while(1) { renv = evapi_queue_get(); if(renv != NULL) { - LM_DBG("processing task: %p\n", renv); + LM_DBG("processing task: %p [%.*s]\n", renv, + renv->msg.len, ZSW(renv->msg.s)); evapi_run_cfg_route(renv, _evapi_rts.msg_received, &_evapi_rts.msg_received_name); shm_free(renv); diff --git a/src/modules/evapi/evapi_dispatch.h b/src/modules/evapi/evapi_dispatch.h index c96bcbf275..44f8cb4a86 100644 --- a/src/modules/evapi/evapi_dispatch.h +++ b/src/modules/evapi/evapi_dispatch.h @@ -53,6 +53,8 @@ int pv_set_evapi(sip_msg_t *msg, pv_param_t *param, int op, int evapi_cfg_close(sip_msg_t *msg); int evapi_set_tag(sip_msg_t* msg, str* stag); +int evapi_clients_init(void); + int evapi_queue_init(void); #endif diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index 708159ba3a..f2a0f1e44b 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -163,6 +163,10 @@ static int mod_init(void) _evapi_bind_addr = _evapi_bind_param; } + if(evapi_clients_init() < 0) { + LM_ERR("failed to init client structures\n"); + return -1; + } if(evapi_queue_init() < 0) { LM_ERR("failed to init faked internal message queue\n"); return -1;

1 0

git:master:789deca1: evapi: safety check on log message during queue get
by Daniel-Constantin Mierla 03 Apr '23

03 Apr '23

Module: kamailio Branch: master Commit: 789deca1842bf278c7539fa05962ab9554c2697e URL: https://github.com/kamailio/kamailio/commit/789deca1842bf278c7539fa05962ab9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-03T21:48:12+02:00 evapi: safety check on log message during queue get --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/789deca1842bf278c7539fa05962ab9… Patch: https://github.com/kamailio/kamailio/commit/789deca1842bf278c7539fa05962ab9… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index c965d0a7ef..f2aef08abf 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -177,7 +177,9 @@ evapi_env_t* evapi_queue_get(void) } lock_release(&_evapi_queue_packets->qlock); - LM_DBG("getting message from queue [%.*s]\n", renv->msg.len, renv->msg.s); + if(renv!=NULL) { + LM_DBG("getting message from queue [%.*s]\n", renv->msg.len, renv->msg.s); + } return renv; }

1 0

git:master:d68671f0: evapi: more debug messages
by Daniel-Constantin Mierla 03 Apr '23

03 Apr '23

Module: kamailio Branch: master Commit: d68671f00097de3b498f4b67175c743bbf79ee72 URL: https://github.com/kamailio/kamailio/commit/d68671f00097de3b498f4b67175c743… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-03T20:37:38+02:00 evapi: more debug messages --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/d68671f00097de3b498f4b67175c743… Patch: https://github.com/kamailio/kamailio/commit/d68671f00097de3b498f4b67175c743… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 2538966662..c965d0a7ef 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -131,6 +131,7 @@ int evapi_queue_add(evapi_env_t *renv) evapi_env_t *nenv; uint32_t ssize; + LM_DBG("adding message to queue [%.*s]\n", renv->msg.len, renv->msg.s); ssize = ROUND_POINTER(sizeof(evapi_env_t)) + renv->msg.len + 1; nenv = (evapi_env_t*)shm_malloc(ssize); if(nenv==NULL) { @@ -176,6 +177,8 @@ evapi_env_t* evapi_queue_get(void) } lock_release(&_evapi_queue_packets->qlock); + LM_DBG("getting message from queue [%.*s]\n", renv->msg.len, renv->msg.s); + return renv; } @@ -555,12 +558,14 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) k += frame.len ; evenv.msg.s = frame.s; evenv.msg.len = frame.len; - LM_DBG("executing event route for frame: [%.*s] (%d)\n", - frame.len, frame.s, frame.len); if(_evapi_workers<=0) { + LM_DBG("executing event route for frame: [%.*s] (%d)\n", + frame.len, frame.s, frame.len); evapi_run_cfg_route(&evenv, _evapi_rts.msg_received, &_evapi_rts.msg_received_name); } else { + LM_DBG("queueing event route for frame: [%.*s] (%d)\n", + frame.len, frame.s, frame.len); evapi_queue_add(&evenv); } k++;

1 0

git:master:757cb48d: lost: additions to <via> path element and corrected loop detection
by Wolfgang Kampichler 01 Apr '23

01 Apr '23

Module: kamailio Branch: master Commit: 757cb48d3606ef23192812a17a66b48c1ce2ea0f URL: https://github.com/kamailio/kamailio/commit/757cb48d3606ef23192812a17a66b48… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2023-04-01T11:03:03+02:00 lost: additions to <via> path element and corrected loop detection - LosT requests that allow recursion now include a <path> element that contains one or more <via> elements. A loop error is indicated if a returned target is already in the server list in the <path> element. --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/757cb48d3606ef23192812a17a66b48… Patch: https://github.com/kamailio/kamailio/commit/757cb48d3606ef23192812a17a66b48…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2023