sr-dev June 2023

sr-dev@lists.kamailio.org

10 participants
309 discussions

git:master:1ce15ab7: cfgt: route_log modparam

by Victor Seva

Module: kamailio Branch: master Commit: 1ce15ab7094d3b13bf6db3cabb86bcdbab969d88 URL: https://github.com/kamailio/kamailio/commit/1ce15ab7094d3b13bf6db3cabb86bcd… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T11:30:40+02:00 cfgt: route_log modparam If enabled, cfgt will log (WARN) the execution time of routes. --- Modified: src/modules/cfgt/cfgt_int.c Modified: src/modules/cfgt/cfgt_int.h Modified: src/modules/cfgt/cfgt_mod.c Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1ce15ab7094d3b13bf6db3cabb86bcd… Patch: https://github.com/kamailio/kamailio/commit/1ce15ab7094d3b13bf6db3cabb86bcd…

1 year, 8 months

git:master:dd9c891b: cfgt: don't dump same node

by Victor Seva

Module: kamailio Branch: master Commit: dd9c891bafe8de5dace630d676f9ea697152a4de URL: https://github.com/kamailio/kamailio/commit/dd9c891bafe8de5dace630d676f9ea6… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T11:30:06+02:00 cfgt: don't dump same node --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/dd9c891bafe8de5dace630d676f9ea6… Patch: https://github.com/kamailio/kamailio/commit/dd9c891bafe8de5dace630d676f9ea6… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 2480f4b66f1..6dba3a1dc94 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -32,6 +32,7 @@ #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../core/parser/msg_parser.h" +#include "../../core/script_cb.h" #include "cfgt_int.h" #include "cfgt_json.h" @@ -460,11 +461,25 @@ void _cfgt_print_node(cfgt_node_p node, int json) int _cfgt_set_dump(struct sip_msg *msg, cfgt_node_p node, str *flow) { + int len; + char v; srjson_t *f, *vars; if(node == NULL || flow == NULL) return -1; + /* don't generate two same nodes */ + if((len = srjson_GetArraySize(&node->jdoc, node->flow)) >= 1) { + f = srjson_GetArrayItem(&node->jdoc, node->flow, len - 1); + STR_VTOZ(flow->s[flow->len], v); + f = srjson_GetObjectItem(&node->jdoc, f, flow->s); + STR_ZTOV(flow->s[flow->len], v); + if(f != NULL) { + LM_DBG("node[%.*s] flow already there\n", flow->len, flow->s); + return 0; + } + } + vars = srjson_CreateObject(&node->jdoc); if(vars == NULL) { LM_ERR("cannot create json object\n"); @@ -763,11 +778,35 @@ int cfgt_msgin(sr_event_param_t *evp) return -1; } +static inline void print_cb_flags(unsigned int flags) +{ + LM_DBG("flags:"); + if(flags & REQUEST_CB) + LM_DBG("REQUEST_CB"); + if(flags & FAILURE_CB) + LM_DBG("FAILURE_CB"); + if(flags & ONREPLY_CB) + LM_DBG("ONREPLY_CB"); + if(flags & BRANCH_CB) + LM_DBG("BRANCH_CB"); + if(flags & ONSEND_CB) + LM_DBG("ONSEND_CB"); + if(flags & ERROR_CB) + LM_DBG("ERROR_CB"); + if(flags & LOCAL_CB) + LM_DBG("LOCAL_CB"); + if(flags & EVENT_CB) + LM_DBG("EVENT_CB"); + if(flags & BRANCH_FAILURE_CB) + LM_DBG("BRANCH_FAILURE_CB"); +} + int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) { str unknown = {"unknown", 7}; int get_hdr_result = 0, res; + print_cb_flags(flags); if(_cfgt_node) { if(_cfgt_node->msgid == 0) { LM_DBG("new node\n"); @@ -812,7 +851,7 @@ int cfgt_pre(struct sip_msg *msg, unsigned int flags, void *bar) int cfgt_post(struct sip_msg *msg, unsigned int flags, void *bar) { str flowname = STR_NULL; - + print_cb_flags(flags); if(_cfgt_node) { if(cfgt_skip_unknown && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) {

1 year, 8 months

git:master:b5ea290b: cfgt: skip_unknown modparam

by Victor Seva

Module: kamailio Branch: master Commit: b5ea290be4a5f92cd24dd39cbefe2987ed577d19 URL: https://github.com/kamailio/kamailio/commit/b5ea290be4a5f92cd24dd39cbefe298… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T11:25:28+02:00 cfgt: skip_unknown modparam If enabled, value different from 0, cfgt will not generate the report of any message that doesn't match the callid_prefix. --- Modified: src/modules/cfgt/cfgt_int.c Modified: src/modules/cfgt/cfgt_mod.c Modified: src/modules/cfgt/doc/cfgt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b5ea290be4a5f92cd24dd39cbefe298… Patch: https://github.com/kamailio/kamailio/commit/b5ea290be4a5f92cd24dd39cbefe298… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 2509b3eb6e7..2480f4b66f1 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -43,6 +43,7 @@ cfgt_hash_p _cfgt_uuid = NULL; str cfgt_hdr_prefix = {"NGCP%", 5}; str cfgt_basedir = {"/tmp", 4}; int cfgt_mask = CFGT_DP_ALL; +int cfgt_skip_unknown = 0; int not_sip = 0; int _cfgt_get_filename(int msgid, str uuid, str *dest, int *dir); @@ -385,6 +386,10 @@ void cfgt_save_node(cfgt_node_p node) str dest = STR_NULL; int dir = 0; struct stat sb; + if(cfgt_skip_unknown && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) { + LM_DBG("skip unknown\n"); + return; + } if(_cfgt_get_filename(node->msgid, node->uuid, &dest, &dir) < 0) { LM_ERR("can't build filename\n"); return; @@ -658,6 +663,9 @@ int cfgt_process_route(struct sip_msg *msg, struct action *a) LM_ERR("node empty\n"); return -1; } + if(cfgt_skip_unknown && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) { + return 0; + } if(a->rname == NULL) { LM_DBG("no routename. type:%d\n", a->type); return 0; @@ -806,6 +814,10 @@ int cfgt_post(struct sip_msg *msg, unsigned int flags, void *bar) str flowname = STR_NULL; if(_cfgt_node) { + if(cfgt_skip_unknown + && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) { + return 1; + } LM_DBG("dump last flow\n"); if(_cfgt_node->route == NULL && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) @@ -844,6 +856,10 @@ int cfgt_msgout(sr_event_param_t *evp) } if(_cfgt_node) { + if(cfgt_skip_unknown + && strncmp(_cfgt_node->uuid.s, "unknown", 7) == 0) { + return 0; + } jobj = srjson_CreateStr(&_cfgt_node->jdoc, buf->s, buf->len); if(jobj == NULL) { LM_ERR("cannot create json object\n"); diff --git a/src/modules/cfgt/cfgt_mod.c b/src/modules/cfgt/cfgt_mod.c index 728d22813c8..7dec36ae064 100644 --- a/src/modules/cfgt/cfgt_mod.c +++ b/src/modules/cfgt/cfgt_mod.c @@ -42,6 +42,7 @@ unsigned int init_flag = 0; extern int cfgt_mask; extern str cfgt_basedir; extern str cfgt_hdr_prefix; +extern int cfgt_skip_unknown; /* clang-format off */ /*! \brief * Exported functions @@ -58,6 +59,7 @@ static param_export_t params[] = { {"basedir", PARAM_STR, &cfgt_basedir}, {"mask", INT_PARAM, &cfgt_mask}, {"callid_prefix", PARAM_STR, &cfgt_hdr_prefix}, + {"skip_unknown", INT_PARAM, &cfgt_skip_unknown}, {0, 0, 0} }; diff --git a/src/modules/cfgt/doc/cfgt_admin.xml b/src/modules/cfgt/doc/cfgt_admin.xml index 2a2b158e57d..84d3df612e6 100644 --- a/src/modules/cfgt/doc/cfgt_admin.xml +++ b/src/modules/cfgt/doc/cfgt_admin.xml @@ -143,6 +143,26 @@ modparam("cfgt", "mask", 12) # using '%' as delimiter modparam("cfgt", "callid_prefix", "TEST-ID%") ... +</programlisting> + </example> + </section> + <section id="cfg.p.skip_unknown"> + <title><varname>skip_unknown</varname> (int)</title> + <para> + If enabled, value different from 0, cfgt will not generate the report + of any message that doesn't match the callid_prefix. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>, false. + </emphasis> + </para> + <example> + <title>Set <varname>skip_unknown</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("cfgt", "skip_unknown", "1") +... </programlisting> </example> </section>

1 year, 8 months

git:master:c3f2ff65: pua_dialoginfo: fix dlg_var store and retrieval

by Victor Seva

Module: kamailio Branch: master Commit: c3f2ff656475d85b190f0a2f138b526d9a63e732 URL: https://github.com/kamailio/kamailio/commit/c3f2ff656475d85b190f0a2f138b526… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-06-14T10:53:34+02:00 pua_dialoginfo: fix dlg_var store and retrieval * pubruri_calle[e|r]_avp can have more than one value. Store values as comma separate strings at pubruri_calle[e|r]_dlg_var * be aware of possible multiple values when restoring values from pubruri_calle[e|r]_dlg_var * alloc string values always for str_list --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/c3f2ff656475d85b190f0a2f138b526… Patch: https://github.com/kamailio/kamailio/commit/c3f2ff656475d85b190f0a2f138b526…

1 year, 8 months

git:master:c064d547: pkg/docker: submodule update [skip ci]

by Sergey Safarov

Module: kamailio Branch: master Commit: c064d5473dd679c1eb191ba012522de409b79420 URL: https://github.com/kamailio/kamailio/commit/c064d5473dd679c1eb191ba012522de… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-06-14T11:10:39+03:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/c064d5473dd679c1eb191ba012522de… Patch: https://github.com/kamailio/kamailio/commit/c064d5473dd679c1eb191ba012522de… --- diff --git a/pkg/docker b/pkg/docker index d34e8eed774..5c45c0f8871 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit d34e8eed77428f84ef15c57bd7402e5161b6021f +Subproject commit 5c45c0f8871ceebb1a8f5308653bca924afb0d6f

1 year, 8 months

git:master:768dd96d: pkg/kamailio/alpine: packaged lwsc

by Sergey Safarov

Module: kamailio Branch: master Commit: 768dd96da6f52e46bc227d9815f7225b33042295 URL: https://github.com/kamailio/kamailio/commit/768dd96da6f52e46bc227d9815f7225… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-06-14T11:10:39+03:00 pkg/kamailio/alpine: packaged lwsc --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/768dd96da6f52e46bc227d9815f7225… Patch: https://github.com/kamailio/kamailio/commit/768dd96da6f52e46bc227d9815f7225… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f895f02ad10..e585cdb66b6 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -31,7 +31,7 @@ makedepends="bison db-dev flex freeradius-client-dev expat-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev - ruby-dev libmaxminddb-dev libunistring-dev mongo-c-driver-dev" + ruby-dev libmaxminddb-dev libunistring-dev mongo-c-driver-dev libwebsockets-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" @@ -137,7 +137,7 @@ _mod_list_tls="auth_identity crypto tls" _mod_list_outbound="outbound" # - modules depending on unistring library -_mod_list_websocket="websocket" +_mod_list_websocket="websocket lwsc" # - modules depending on libval-threads libcrypto libsres libpthread _mod_list_dnssec="dnssec"

1 year, 8 months

git:master:88bcd44e: cdp: log message when failing to set nonblock on socket

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 88bcd44e07b43b723bb0ddc7b828f605179ae893 URL: https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T08:44:35+02:00 cdp: log message when failing to set nonblock on socket --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f60… Patch: https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f60… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index dccfcd5bd29..9124c4eef49 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -949,7 +949,9 @@ int peer_connect(peer *p) { // Connect with timeout int x; x = fcntl(sock, F_GETFL, 0); - fcntl(sock, F_SETFL, x | O_NONBLOCK); + if(fcntl(sock, F_SETFL, x | O_NONBLOCK) < 0) { + LM_WARN("failed to set O_NONBLOCK on socket %d\n", sock); + } int res = connect(sock, ainfo->ai_addr, ainfo->ai_addrlen); if(res < 0) { if(errno == EINPROGRESS) {

1 year, 8 months

git:master:eaa4b177: cdp: safety check on diameter msg processing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: eaa4b177652259efda4e61aac9dd039ebde253c9 URL: https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T08:33:23+02:00 cdp: safety check on diameter msg processing --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039… Patch: https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 2cdba653d56..24d5aed959e 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -1338,6 +1338,11 @@ void Rcv_Process(peer *p, AAAMessage *msg) { AAASession *session = 0; int nput = 0; + + if(!msg) { + return; + } + if(msg->sessionId) session = cdp_get_session(msg->sessionId->data); @@ -1408,8 +1413,7 @@ void Rcv_Process(peer *p, AAAMessage *msg) } if(!nput && !put_task(p, msg)) { LM_ERR("Rcv_Process(): Queue refused task\n"); - if(msg) - AAAFreeMessage(&msg); + AAAFreeMessage(&msg); } //if (msg) LM_ERR("Rcv_Process(): task added to queue command %d, flags %#1x endtoend %u hopbyhop %u\n",msg->commandCode,msg->flags,msg->endtoendId,msg->hopbyhopId);

1 year, 8 months

git:master:81ee6f7e: cdp: dedicated log messages for timeout events

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 81ee6f7e9eb23c24fb06dd2c201f3246d6044c4d URL: https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T08:28:58+02:00 cdp: dedicated log messages for timeout events --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f324… Patch: https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f324… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 9419b77134c..2cdba653d56 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -157,6 +157,9 @@ int sm_process( case Timeout: Error(p, p->I_sock); p->state = Closed; + LM_ERR("in state %s timeout event %s\n", + dp_states[p->state], dp_events[event - 101]); + goto error; default: LM_ERR("sm_process(): In state %s invalid event %s\n", dp_states[p->state], dp_events[event - 101]); @@ -344,6 +347,9 @@ int sm_process( if(p->R_sock >= 0) Error(p, p->R_sock); p->state = Closed; + LM_ERR("in state %s timeout event %s\n", + dp_states[p->state], dp_events[event - 101]); + goto error; default: LM_ERR("sm_process(): In state %s invalid event %s\n", dp_states[p->state], dp_events[event - 101]);

1 year, 8 months

git:master:f8bfc8d2: cdp: reworked same code execution in if branches

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f8bfc8d2c9f8b366e6a0d8d3b1790077ccca5b7e URL: https://github.com/kamailio/kamailio/commit/f8bfc8d2c9f8b366e6a0d8d3b179007… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-06-14T07:58:54+02:00 cdp: reworked same code execution in if branches --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/f8bfc8d2c9f8b366e6a0d8d3b179007… Patch: https://github.com/kamailio/kamailio/commit/f8bfc8d2c9f8b366e6a0d8d3b179007… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index c09ac06fc2b..9419b77134c 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -929,10 +929,10 @@ void Snd_DWR(peer *p) return; dwr->hopbyhopId = next_hopbyhop(); dwr->endtoendId = next_endtoend(); - if(p->state == I_Open) - peer_send_msg(p, dwr); - else - peer_send_msg(p, dwr); + if(p->state == I_Open) { + LM_DBG("sending in state I_Open\n"); + } + peer_send_msg(p, dwr); } /** @@ -981,10 +981,10 @@ void Snd_DPR(peer *p) AAACreateAndAddAVPToMessage( dpr, AVP_Disconnect_Cause, AAA_AVP_FLAG_MANDATORY, 0, x, 4); - if(p->state == I_Open) - peer_send_msg(p, dpr); - else - peer_send_msg(p, dpr); + if(p->state == I_Open) { + LM_DBG("sending in state I_Open\n"); + } + peer_send_msg(p, dpr); } /**

1 year, 8 months

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2023