[sr-dev] Re: [kamailio/kamailio] rtpengine: support receiving events from rtpengine and raise an event (PR #3473)
LGTM now -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3473#issuecomment-1591099003 You are receiving this because you are subscribed to this thread. Message ID: ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:3a8ebf57: db_redis: graceful scan
Module: kamailio
Branch: master
Commit: 3a8ebf5717eba0116cb71c7f953e9b7ff60d4b0e
URL:
https://github.com/kamailio/kamailio/commit/3a8ebf5717eba0116cb71c7f953e9b7ff60d4b0e
Author: Sipwise Development Team
Committer: Victor Seva
Date: 2023-06-14T14:26:27+02:00
db_redis: graceful scan
---
Modified: src/modules/db_redis/redis_dbase.c
---
Diff:
https://github.com/kamailio/kamailio/commit/3a8ebf5717eba0116cb71c7f953e9b7ff60d4b0e.diff
Patch:
https://github.com/kamailio/kamailio/commit/3a8ebf5717eba0116cb71c7f953e9b7ff60d4b0e.patch
---
diff --git a/src/modules/db_redis/redis_dbase.c
b/src/modules/db_redis/redis_dbase.c
index bda72446d9..eebd7e54ce 100644
--- a/src/modules/db_redis/redis_dbase.c
+++ b/src/modules/db_redis/redis_dbase.c
@@ -824,7 +824,7 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t
*con,
int l;
-#undef USE_SCAN
+#define USE_SCAN
#ifdef USE_SCAN
@@ -832,6 +832,8 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t
*con,
unsigned long cursor = 0;
unsigned int match_count = match_count_start_val;
char match_count_str[16];
+ struct timeval start_tv, end_tv;
+ long tv_diff;
do {
snprintf(cursor_str, sizeof(cursor_str), "%lu", cursor);
@@ -869,8 +871,12 @@ static int db_redis_scan_query_keys_pattern(km_redis_con_t
*con,
LM_ERR("Failed to add count value to scan query\n");
goto err;
}
-
+ gettimeofday(_tv, NULL);
reply = db_redis_command_argv(con, query_v);
+ gettimeofday(_tv, NULL);
+ tv_diff = ((long long)end_tv.tv_sec * 1000LL + end_tv.tv_usec /
1000L)
+ - ((long long)start_tv.tv_sec * 1000LL
+ + start_tv.tv_usec / 1000L);
db_redis_key_free(_v);
db_redis_check_reply(con, reply, err);
if(reply->type != REDIS_REPLY_ARRAY) {
@@ -966,11 +972,15 @@ static int
db_redis_scan_query_keys_pattern(km_redis_con_t *con,
}
#ifdef USE_SCAN
- // exponential increase and falloff, hovering around 1000
results
- if(keys_list->elements > 1300 && match_count > 500)
+ // exponential increase and falloff, not to exceed ~100 ms
query run time
+ if(tv_diff > 50 && match_count > 10)
match_count /= 2;
- else if(keys_list->elements < 700 && match_count < 50)
+ else if(tv_diff < 25 && match_count < 100)
match_count *= 2;
+ if(cursor > 0) {
+ // give other queries some time to run
+ usleep(10);
+ }
#endif
db_redis_free_reply();
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:41c47363: db_redis: use sscan
Module: kamailio Branch: master Commit: 41c4736367186f43e68361be0460bd590b7660bd URL: https://github.com/kamailio/kamailio/commit/41c4736367186f43e68361be0460bd590b7660bd Author: Sipwise Development Team Committer: Victor Seva Date: 2023-06-14T14:26:28+02:00 db_redis: use sscan --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/41c4736367186f43e68361be0460bd590b7660bd.diff Patch: https://github.com/kamailio/kamailio/commit/41c4736367186f43e68361be0460bd590b7660bd.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:c5a3c2cd: db_redis: skip empty keys
Module: kamailio
Branch: master
Commit: c5a3c2cd8c6952356237c235c2ade159c030382b
URL:
https://github.com/kamailio/kamailio/commit/c5a3c2cd8c6952356237c235c2ade159c030382b
Author: Sipwise Development Team
Committer: Victor Seva
Date: 2023-06-14T14:26:27+02:00
db_redis: skip empty keys
---
Modified: src/modules/db_redis/redis_dbase.c
---
Diff:
https://github.com/kamailio/kamailio/commit/c5a3c2cd8c6952356237c235c2ade159c030382b.diff
Patch:
https://github.com/kamailio/kamailio/commit/c5a3c2cd8c6952356237c235c2ade159c030382b.patch
---
diff --git a/src/modules/db_redis/redis_dbase.c
b/src/modules/db_redis/redis_dbase.c
index 83d11e9b318..bda72446d96 100644
--- a/src/modules/db_redis/redis_dbase.c
+++ b/src/modules/db_redis/redis_dbase.c
@@ -700,6 +700,9 @@ static int db_redis_build_query_keys(km_redis_con_t *con,
const str *table_name,
LM_DBG("no direct entry key found, checking type keys\n");
for(type = table->types; type; type = type->next) {
key = type->keys;
+ /* skip value-less master keys */
+ if(!key)
+ continue;
LM_DBG("checking type '%.*s'\n", type->type.len,
type->type.s);
if(db_redis_find_query_key(key, table_name, table,
>type, _k,
_v, _op, _n, , _found,
ts_scan_start)
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:10a95d7c: modules: readme files regenerated - cfgt ... [skip ci]
Module: kamailio
Branch: master
Commit: 10a95d7c327a4bb83645723781d5885839f6fd0b
URL:
https://github.com/kamailio/kamailio/commit/10a95d7c327a4bb83645723781d5885839f6fd0b
Author: Kamailio Dev
Committer: Kamailio Dev
Date: 2023-06-14T11:46:19+02:00
modules: readme files regenerated - cfgt ... [skip ci]
---
Modified: src/modules/cfgt/README
---
Diff:
https://github.com/kamailio/kamailio/commit/10a95d7c327a4bb83645723781d5885839f6fd0b.diff
Patch:
https://github.com/kamailio/kamailio/commit/10a95d7c327a4bb83645723781d5885839f6fd0b.patch
---
diff --git a/src/modules/cfgt/README b/src/modules/cfgt/README
index 6cad032f141..7133ef3d643 100644
--- a/src/modules/cfgt/README
+++ b/src/modules/cfgt/README
@@ -28,6 +28,8 @@ Victor Seva
3.1. basedir (string)
3.2. mask (int)
3.3. callid_prefix (string)
+ 3.4. skip_unknown (int)
+ 3.5. route_log (int)
4. RPC Commands
@@ -43,6 +45,8 @@ Victor Seva
1.1. Set cfgtrace parameter
1.2. Set mask parameter
1.3. Set callid_prefix parameter
+ 1.4. Set skip_unknown parameter
+ 1.5. Set route_log parameter
Chapter 1. Admin Guide
@@ -59,6 +63,8 @@ Chapter 1. Admin Guide
3.1. basedir (string)
3.2. mask (int)
3.3. callid_prefix (string)
+3.4. skip_unknown (int)
+3.5. route_log (int)
4. RPC Commands
@@ -99,6 +105,8 @@ Chapter 1. Admin Guide
3.1. basedir (string)
3.2. mask (int)
3.3. callid_prefix (string)
+ 3.4. skip_unknown (int)
+ 3.5. route_log (int)
3.1. basedir (string)
@@ -145,6 +153,30 @@ modparam("cfgt", "mask", 12)
modparam("cfgt", "callid_prefix", "TEST-ID%")
...
+3.4. skip_unknown (int)
+
+ If enabled, value different from 0, cfgt will not generate the report
+ of any message that doesn't match the callid_prefix.
+
+ Default value is ???0???, false.
+
+ Example 1.4. Set skip_unknown parameter
+...
+modparam("cfgt", "skip_unknown", "1")
+...
+
+3.5. route_log (int)
+
+ If enabled, value different from 0, cfgt will log (WARN) the execution
+ time of routes.
+
+ Default value is ???0???, false.
+
+ Example 1.5. Set route_log parameter
+...
+modparam("cfgt", "route_log", "1")
+...
+
4. RPC Commands
4.1. cfgt.mask
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:60485701: pv_headers: rework pvh_remove_header_param, take two
Module: kamailio Branch: master Commit: 60485701ea3c065e657206ebcb6dbfa212adf1d4 URL: https://github.com/kamailio/kamailio/commit/60485701ea3c065e657206ebcb6dbfa212adf1d4 Author: Victor Seva Committer: Victor Seva Date: 2023-06-14T11:43:43+02:00 pv_headers: rework pvh_remove_header_param, take two * pvh_set_xavi changes/removes xavi, so we need the new value * after pvh_remove_header, search for the header again --- Modified: src/modules/pv_headers/pv_headers.c Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_xavp.c Modified: src/modules/pv_headers/pvh_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/60485701ea3c065e657206ebcb6dbfa212adf1d4.diff Patch: https://github.com/kamailio/kamailio/commit/60485701ea3c065e657206ebcb6dbfa212adf1d4.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:dd9c891b: cfgt: don't dump same node
Module: kamailio
Branch: master
Commit: dd9c891bafe8de5dace630d676f9ea697152a4de
URL:
https://github.com/kamailio/kamailio/commit/dd9c891bafe8de5dace630d676f9ea697152a4de
Author: Victor Seva
Committer: Victor Seva
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/dd9c891bafe8de5dace630d676f9ea697152a4de.diff
Patch:
https://github.com/kamailio/kamailio/commit/dd9c891bafe8de5dace630d676f9ea697152a4de.patch
---
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(>jdoc, node->flow)) >= 1) {
+ f = srjson_GetArrayItem(>jdoc, node->flow, len - 1);
+ STR_VTOZ(flow->s[flow->len], v);
+ f = srjson_GetObjectItem(>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(>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) {
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:b5ea290b: cfgt: skip_unknown modparam
Module: kamailio
Branch: master
Commit: b5ea290be4a5f92cd24dd39cbefe2987ed577d19
URL:
https://github.com/kamailio/kamailio/commit/b5ea290be4a5f92cd24dd39cbefe2987ed577d19
Author: Victor Seva
Committer: Victor Seva
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/b5ea290be4a5f92cd24dd39cbefe2987ed577d19.diff
Patch:
https://github.com/kamailio/kamailio/commit/b5ea290be4a5f92cd24dd39cbefe2987ed577d19.patch
---
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, , ) < 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, _basedir},
{"mask", INT_PARAM, _mask},
{"callid_prefix", PARAM_STR, _hdr_prefix},
+ {"skip_unknown", INT_PARAM, _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%")
...
+
+
+
+
+ skip_unknown (int)
+
+ If enabled, value different from 0, cfgt will not
generate the report
+ of any message that doesn't match the callid_prefix.
+
+
+
+ Default value is 0, false.
+
+
+
+ Set skip_unknown parameter
+
+...
+modparam("cfgt", "skip_unknown", "1")
+...
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:1ce15ab7: cfgt: route_log modparam
Module: kamailio Branch: master Commit: 1ce15ab7094d3b13bf6db3cabb86bcdbab969d88 URL: https://github.com/kamailio/kamailio/commit/1ce15ab7094d3b13bf6db3cabb86bcdbab969d88 Author: Victor Seva Committer: Victor Seva 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/1ce15ab7094d3b13bf6db3cabb86bcdbab969d88.diff Patch: https://github.com/kamailio/kamailio/commit/1ce15ab7094d3b13bf6db3cabb86bcdbab969d88.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:c3f2ff65: pua_dialoginfo: fix dlg_var store and retrieval
Module: kamailio Branch: master Commit: c3f2ff656475d85b190f0a2f138b526d9a63e732 URL: https://github.com/kamailio/kamailio/commit/c3f2ff656475d85b190f0a2f138b526d9a63e732 Author: Victor Seva Committer: Victor Seva 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/c3f2ff656475d85b190f0a2f138b526d9a63e732.diff Patch: https://github.com/kamailio/kamailio/commit/c3f2ff656475d85b190f0a2f138b526d9a63e732.patch ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:768dd96d: pkg/kamailio/alpine: packaged lwsc
Module: kamailio Branch: master Commit: 768dd96da6f52e46bc227d9815f7225b33042295 URL: https://github.com/kamailio/kamailio/commit/768dd96da6f52e46bc227d9815f7225b33042295 Author: Sergey Safarov Committer: Sergey Safarov 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/768dd96da6f52e46bc227d9815f7225b33042295.diff Patch: https://github.com/kamailio/kamailio/commit/768dd96da6f52e46bc227d9815f7225b33042295.patch --- 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" ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:c064d547: pkg/docker: submodule update [skip ci]
Module: kamailio Branch: master Commit: c064d5473dd679c1eb191ba012522de409b79420 URL: https://github.com/kamailio/kamailio/commit/c064d5473dd679c1eb191ba012522de409b79420 Author: Sergey Safarov Committer: Sergey Safarov Date: 2023-06-14T11:10:39+03:00 pkg/docker: submodule update [skip ci] --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/c064d5473dd679c1eb191ba012522de409b79420.diff Patch: https://github.com/kamailio/kamailio/commit/c064d5473dd679c1eb191ba012522de409b79420.patch --- diff --git a/pkg/docker b/pkg/docker index d34e8eed774..5c45c0f8871 16 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit d34e8eed77428f84ef15c57bd7402e5161b6021f +Subproject commit 5c45c0f8871ceebb1a8f5308653bca924afb0d6f ___ Kamailio (SER) - Development Mailing List To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:81ee6f7e: cdp: dedicated log messages for timeout events
Module: kamailio
Branch: master
Commit: 81ee6f7e9eb23c24fb06dd2c201f3246d6044c4d
URL:
https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f3246d6044c4d
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
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/81ee6f7e9eb23c24fb06dd2c201f3246d6044c4d.diff
Patch:
https://github.com/kamailio/kamailio/commit/81ee6f7e9eb23c24fb06dd2c201f3246d6044c4d.patch
---
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]);
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:88bcd44e: cdp: log message when failing to set nonblock on socket
Module: kamailio
Branch: master
Commit: 88bcd44e07b43b723bb0ddc7b828f605179ae893
URL:
https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f605179ae893
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
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/88bcd44e07b43b723bb0ddc7b828f605179ae893.diff
Patch:
https://github.com/kamailio/kamailio/commit/88bcd44e07b43b723bb0ddc7b828f605179ae893.patch
---
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) {
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:eaa4b177: cdp: safety check on diameter msg processing
Module: kamailio
Branch: master
Commit: eaa4b177652259efda4e61aac9dd039ebde253c9
URL:
https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039ebde253c9
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
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/eaa4b177652259efda4e61aac9dd039ebde253c9.diff
Patch:
https://github.com/kamailio/kamailio/commit/eaa4b177652259efda4e61aac9dd039ebde253c9.patch
---
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();
+ AAAFreeMessage();
}
//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);
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] Re: [kamailio/kamailio] rtpengine: support receiving events from rtpengine and raise an event (PR #3473)
@joeygo commented on this pull request.
> + }
+
+ if(rank == PROC_MAIN) {
+ if(rtpengine_dtmf_event_sock.len > 0) {
+ LM_DBG("Register RTPENGINE DTMF WORKER %d\n", mypid);
+ /* fork worker process */
+ mypid = fork_process(PROC_RPC, "RTPENGINE DTMF WORKER",
1);
+ if(mypid < 0) {
+ LM_ERR("failed to fork RTPENGINE DTMF WORKER
process %d\n", mypid);
+ return -1;
+ } else if(mypid == 0) {
+ if(cfg_child_init())
+ return -1;
+ /* this will loop forever */
+ rtpengine_dtmf_events_loop();
+ }
I don't think it is right to kill the entire kamailio process due to an exit in
such function.
I print error logs in case of failure in the function. isn't it enough?
If you prefer that I'll kill the process just let me know and I'll do that.
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3473#discussion_r1229071053
You are receiving this because you are subscribed to this thread.
Message ID: ___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
[sr-dev] git:master:f8bfc8d2: cdp: reworked same code execution in if branches
Module: kamailio
Branch: master
Commit: f8bfc8d2c9f8b366e6a0d8d3b1790077ccca5b7e
URL:
https://github.com/kamailio/kamailio/commit/f8bfc8d2c9f8b366e6a0d8d3b1790077ccca5b7e
Author: Daniel-Constantin Mierla
Committer: Daniel-Constantin Mierla
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/f8bfc8d2c9f8b366e6a0d8d3b1790077ccca5b7e.diff
Patch:
https://github.com/kamailio/kamailio/commit/f8bfc8d2c9f8b366e6a0d8d3b1790077ccca5b7e.patch
---
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);
}
/**
___
Kamailio (SER) - Development Mailing List
To unsubscribe send an email to sr-dev-le...@lists.kamailio.org
