sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
385 discussions

git:master:c8695084: tm: enable t_reply_error() in same routing blocks like t_reply()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c86950841dfc0ca18ad1956efd1dc374a4eb064b URL: https://github.com/kamailio/kamailio/commit/c86950841dfc0ca18ad1956efd1dc37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-04T16:42:46+01:00 tm: enable t_reply_error() in same routing blocks like t_reply() --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/c86950841dfc0ca18ad1956efd1dc37… Patch: https://github.com/kamailio/kamailio/commit/c86950841dfc0ca18ad1956efd1dc37… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index ec83abedaae..cb34dd4a036 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -256,7 +256,8 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE}, {"t_reply", w_t_reply, 2, fixup_t_reply, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, - {"t_reply_error", w_t_reply_error, 0, 0, 0, REQUEST_ROUTE}, + {"t_reply_error", w_t_reply_error, 0, 0, 0, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"t_send_reply", w_t_send_reply, 2, fixup_t_reply, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"t_retransmit_reply", w_t_retransmit_reply, 0, 0, 0, REQUEST_ROUTE},

6 months, 2 weeks

git:master:0def9a07: db_redis: wrapp field version_code.s with ZSW() to be safer when it is not set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0def9a071343c963ab3a497540534d8ea3b8eebc URL: https://github.com/kamailio/kamailio/commit/0def9a071343c963ab3a497540534d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T11:40:29+01:00 db_redis: wrapp field version_code.s with ZSW() to be safer when it is not set --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/0def9a071343c963ab3a497540534d8… Patch: https://github.com/kamailio/kamailio/commit/0def9a071343c963ab3a497540534d8… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index ff41aa45282..84c0c3a9459 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -22,6 +22,8 @@ #include <stdlib.h> #include <time.h> +#include "../../core/ut.h" + #include "db_redis_mod.h" #include "redis_connection.h" #include "redis_dbase.h" @@ -360,7 +362,7 @@ static int db_redis_find_query_key(redis_key_t *key, const str *table_name, goto err; } snprintf(key_name->s, len, "%.*s%.*s:%.*s::%.*s", - table->version_code.len, table->version_code.s, + table->version_code.len, ZSW(table->version_code.s), table_name->len, table_name->s, type_name->len, type_name->s, val.len, val.s); key_name->len = len - 1; // subtract the term 0 char @@ -456,7 +458,7 @@ static int db_redis_find_query_key(redis_key_t *key, const str *table_name, goto err; } snprintf(key_name->s, len, "%.*s%.*s:%.*s", table->version_code.len, - table->version_code.s, table_name->len, table_name->s, + ZSW(table->version_code.s), table_name->len, table_name->s, type_name->len, type_name->s); key_name->len = len - 1; } @@ -621,7 +623,7 @@ static int db_redis_build_type_keys(km_redis_con_t *con, const str *table_name, goto err; } sprintf(keyname.s, "%.*s%.*s::index::%.*s", - table->version_code.len, table->version_code.s, + table->version_code.len, ZSW(table->version_code.s), table_name->len, table_name->s, type->type.len, type->type.s); if(db_redis_key_add_str(set_keys, &keyname) != 0) { @@ -787,7 +789,7 @@ static int db_redis_build_query_keys(km_redis_con_t *con, const str *table_name, goto err; } sprintf(ts_scan_table->s, "%.*s%.*s::index::%.*s", - table->version_code.len, table->version_code.s, + table->version_code.len, ZSW(table->version_code.s), table_name->len, table_name->s, type->type.len, type->type.s); } @@ -1094,7 +1096,7 @@ static int db_redis_scan_query_keys(km_redis_con_t *con, const str *table_name, return -1; } int len = sprintf(match, "%.*s%.*s:entry::*", table->version_code.len, - table->version_code.s, table_name->len, table_name->s); + ZSW(table->version_code.s), table_name->len, table_name->s); str match_pattern = {match, len}; ret = db_redis_scan_query_keys_pattern(con, &match_pattern, ts_scan_table, _n, query_keys, query_keys_count, manual_keys,

6 months, 2 weeks

git:master:e24df12d: db_redis: init allocated redis table structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e24df12d10d8b88582907481d161c6a2db5cf8f1 URL: https://github.com/kamailio/kamailio/commit/e24df12d10d8b88582907481d161c6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T11:00:34+01:00 db_redis: init allocated redis table structure --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/e24df12d10d8b88582907481d161c6a… Patch: https://github.com/kamailio/kamailio/commit/e24df12d10d8b88582907481d161c6a… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index 33b097a9674..10dd7d57960 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -433,8 +433,7 @@ static struct str_hash_entry *db_redis_create_table(str *table) pkg_free(e); return NULL; } - t->entry_keys = NULL; - t->types = NULL; + memset(t, 0, sizeof(redis_table_t)); if(str_hash_alloc(&t->columns, REDIS_HT_SIZE) != 0) { LM_ERR("Failed to allocate memory for table schema hashtable\n");

6 months, 2 weeks

git:master:d4995bf2: modules: readme files regenerated - sl ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d4995bf2791bd1048ac8a7f32e51ae6949562ce3 URL: https://github.com/kamailio/kamailio/commit/d4995bf2791bd1048ac8a7f32e51ae6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-03T09:17:27+01:00 modules: readme files regenerated - sl ... [skip ci] --- Modified: src/modules/sl/README --- Diff: https://github.com/kamailio/kamailio/commit/d4995bf2791bd1048ac8a7f32e51ae6… Patch: https://github.com/kamailio/kamailio/commit/d4995bf2791bd1048ac8a7f32e51ae6… --- diff --git a/src/modules/sl/README b/src/modules/sl/README index 615e7a531bb..6433a1d7ebe 100644 --- a/src/modules/sl/README +++ b/src/modules/sl/README @@ -32,6 +32,7 @@ Daniel-Constantin Mierla 3.3. send_reply_mode(code, reason, mode) 3.4. sl_reply_error() 3.5. sl_forward_reply([ code, [ reason ] ]) + 3.6. send_reply_error() 4. Statistics @@ -78,6 +79,7 @@ Daniel-Constantin Mierla 1.9. send_reply_mode usage 1.10. sl_reply_error usage 1.11. send_reply usage + 1.12. send_reply_error usage Chapter 1. Admin Guide @@ -100,6 +102,7 @@ Chapter 1. Admin Guide 3.3. send_reply_mode(code, reason, mode) 3.4. sl_reply_error() 3.5. sl_forward_reply([ code, [ reason ] ]) + 3.6. send_reply_error() 4. Statistics @@ -252,6 +255,7 @@ modparam("sl", "event_callback_lres_sent", "ksr_event_sl_local_response") 3.3. send_reply_mode(code, reason, mode) 3.4. sl_reply_error() 3.5. sl_forward_reply([ code, [ reason ] ]) + 3.6. send_reply_error() 3.1. sl_send_reply(code, reason) @@ -350,6 +354,20 @@ if(status=="408") sl_forward_reply("404", "Not found"); ... +3.6. send_reply_error() + + For the current request, the internal error code reply is sent back + stateful or stateless, depending of the TM module: if a transaction + exists for the current request, then the reply is sent statefully, + otherwise stateless. + + It can be used from REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. + + Example 1.12. send_reply_error usage +... +send_reply_error(); +... + 4. Statistics 4.1. 1xx_replies

6 months, 2 weeks

git:master:cb529523: sl: docs for send_reply_error()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cb5295234a1b106473c3fdb9ff25c23bfc9fbcd1 URL: https://github.com/kamailio/kamailio/commit/cb5295234a1b106473c3fdb9ff25c23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T09:06:38+01:00 sl: docs for send_reply_error() --- Modified: src/modules/sl/doc/sl_functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/cb5295234a1b106473c3fdb9ff25c23… Patch: https://github.com/kamailio/kamailio/commit/cb5295234a1b106473c3fdb9ff25c23… --- diff --git a/src/modules/sl/doc/sl_functions.xml b/src/modules/sl/doc/sl_functions.xml index 11ef4706755..8f2715b7a00 100644 --- a/src/modules/sl/doc/sl_functions.xml +++ b/src/modules/sl/doc/sl_functions.xml @@ -130,7 +130,7 @@ send_reply_mode("403", "Invalid user - $fU", "3"); </title> <para> Sends back an error reply describing the nature of the last - internal error. Usually this function should be used after a + internal error. Usually this function should be used after a script function that returned an error code. </para> <example> @@ -174,6 +174,29 @@ sl_reply_error(); if(status=="408") sl_forward_reply("404", "Not found"); ... +</programlisting> + </example> + </section> + + <section id="sl.f.send_reply_error"> + <title> + <function moreinfo="none">send_reply_error()</function> + </title> + <para> + For the current request, the internal error code reply is sent back + stateful or stateless, depending of the <acronym>TM</acronym> module: + if a transaction exists for the current request, then the reply is sent + statefully, otherwise stateless. + </para> + <para> + It can be used from REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. + </para> + <example> + <title><function>send_reply_error</function> usage</title> + <programlisting format="linespecific"> +... +send_reply_error(); +... </programlisting> </example> </section>

6 months, 2 weeks

git:master:130dc00c: sl: added send_reply_error()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 130dc00c1700839248a044f8ae6d4a9e9c97d301 URL: https://github.com/kamailio/kamailio/commit/130dc00c1700839248a044f8ae6d4a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T09:00:14+01:00 sl: added send_reply_error() - wrapper around t_reply_error() and sl_reply_error() --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/130dc00c1700839248a044f8ae6d4a9… Patch: https://github.com/kamailio/kamailio/commit/130dc00c1700839248a044f8ae6d4a9… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 0ee22efcc0a..2a8f49fe78c 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -73,6 +73,7 @@ static int w_sl_send_reply(struct sip_msg *msg, char *str1, char *str2); static int w_send_reply(struct sip_msg *msg, char *str1, char *str2); static int w_send_reply_mode( struct sip_msg *msg, char *str1, char *str2, char *str3); +static int w_send_reply_error(sip_msg_t *msg, char *str1, char *str2); static int w_sl_reply_error(struct sip_msg *msg, char *str1, char *str2); static int w_sl_forward_reply0(sip_msg_t *msg, char *str1, char *str2); static int w_sl_forward_reply1(sip_msg_t *msg, char *str1, char *str2); @@ -102,6 +103,8 @@ static cmd_export_t cmds[] = { {"send_reply_mode", (cmd_function)w_send_reply_mode, 3, fixup_sl_reply_mode, 0, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, + {"send_reply_error", w_send_reply_error, 0, 0, 0, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE}, {"sl_reply_error", w_sl_reply_error, 0, 0, 0, REQUEST_ROUTE}, {"sl_forward_reply", w_sl_forward_reply0, 0, 0, 0, ONREPLY_ROUTE}, {"sl_forward_reply", w_sl_forward_reply1, 1, fixup_spve_all, 0, @@ -326,6 +329,29 @@ static int w_send_reply(struct sip_msg *msg, char *p1, char *p2) return send_reply(msg, code, &reason); } +/** + * + */ +static int ki_send_reply_error(sip_msg_t *msg) +{ + int ret; + if(sl_bind_tm != 0 && tmb.t_reply_error != NULL) { + ret = tmb.t_reply_error(msg); + if(ret > 0) { + return ret; + } + } + return sl_reply_error(msg); +} + +/** + * + */ +static int w_send_reply_error(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_send_reply_error(msg); +} + /** * @brief send stateful reply if transaction was created * @@ -672,6 +698,11 @@ static sr_kemi_t sl_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sl"), str_init("send_reply_error"), + SR_KEMIP_INT, ki_send_reply_error, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sl"), str_init("sl_forward_reply"), SR_KEMIP_INT, w_sl_forward_reply, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

6 months, 2 weeks

git:master:20979227: tm: exposed t_reply_error() to intermodule API

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2097922746d12d332ce923193af9c624429b7f96 URL: https://github.com/kamailio/kamailio/commit/2097922746d12d332ce923193af9c62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-03T08:41:08+01:00 tm: exposed t_reply_error() to intermodule API --- Modified: src/modules/tm/t_reply.h Modified: src/modules/tm/tm.c Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/2097922746d12d332ce923193af9c62… Patch: https://github.com/kamailio/kamailio/commit/2097922746d12d332ce923193af9c62… --- diff --git a/src/modules/tm/t_reply.h b/src/modules/tm/t_reply.h index 38fe67f5cd5..709b70454ed 100644 --- a/src/modules/tm/t_reply.h +++ b/src/modules/tm/t_reply.h @@ -178,6 +178,8 @@ int t_reply_str(struct cell *t, struct sip_msg *, unsigned int, str *); int t_reply_unsafe(struct cell *t, struct sip_msg *, unsigned int, char *); int t_reply_str_unsafe(struct cell *t, struct sip_msg *, unsigned int, str *); +int ki_t_reply_error(sip_msg_t *msg); + enum rps relay_reply(struct cell *t, struct sip_msg *p_msg, int branch, unsigned int msg_status, struct cancel_info *cancel_data, diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index bf30639a248..ec83abedaae 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1596,7 +1596,7 @@ int w_t_reply_wrp(struct sip_msg *msg, unsigned int code, char *txt) /** * kemi function to send reply based on internal error code */ -static int ki_t_reply_error(sip_msg_t *msg) +int ki_t_reply_error(sip_msg_t *msg) { char err_buffer[128]; str reason; diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index dced3edbeef..7149873515e 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -143,6 +143,7 @@ int load_tm(struct tm_binds *tmb) tmb->set_fr = t_set_fr; tmb->t_release_transaction = t_release_transaction; tmb->t_uas_request_clean_parsed = t_uas_request_clean_parsed; + tmb->t_reply_error = ki_t_reply_error; return 1; } diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index f13c04cde6f..bf41eb789ef 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -43,6 +43,9 @@ /* export not usable from scripts */ #define NO_SCRIPT -1 +typedef void (*t_on_route_f)(unsigned int); +typedef int (*t_no_param_f)(struct sip_msg *); + struct tm_binds { register_tmcb_f register_tmcb; @@ -127,6 +130,7 @@ struct tm_binds tset_fr_f set_fr; trelease_t t_release_transaction; t_uas_request_clean_parsed_f t_uas_request_clean_parsed; + t_no_param_f t_reply_error; }; typedef struct tm_binds tm_api_t; @@ -165,9 +169,6 @@ static inline int tm_load_api(tm_api_t *tmb) * eXtra API - not common used in other modules */ -typedef void (*t_on_route_f)(unsigned int); -typedef int (*t_no_param_f)(struct sip_msg *); - int t_check_trans(struct sip_msg *msg); int t_is_canceled(struct sip_msg *msg);

6 months, 2 weeks

git:master:21eeb977: core: add transport parameter for ws/wss advertised proto

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 21eeb977c882dec4540703b2d8b4ff5131e6c446 URL: https://github.com/kamailio/kamailio/commit/21eeb977c882dec4540703b2d8b4ff5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-02T14:01:58+01:00 core: add transport parameter for ws/wss advertised proto --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/21eeb977c882dec4540703b2d8b4ff5… Patch: https://github.com/kamailio/kamailio/commit/21eeb977c882dec4540703b2d8b4ff5… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f5f7be8c9f9..9bb142efea8 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1094,6 +1094,9 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, break; \ case PROTO_WS: \ case PROTO_WSS: \ + memcpy(new_buf + offset, TRANSPORT_PARAM, \ + TRANSPORT_PARAM_LEN); \ + offset += TRANSPORT_PARAM_LEN; \ memcpy(new_buf + offset, "ws", 2); \ offset += 2; \ break; \ @@ -1217,6 +1220,9 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, break; \ case PROTO_WS: \ case PROTO_WSS: \ + memcpy(new_buf + offset, TRANSPORT_PARAM, \ + TRANSPORT_PARAM_LEN); \ + offset += TRANSPORT_PARAM_LEN; \ memcpy(new_buf + offset, "ws", 2); \ offset += 2; \ break; \

6 months, 2 weeks

[kamailio/kamailio] wrong code for new mod param of pdt module (Issue #3626)

by doktorsip

### Description This new code in pdttree.c is not correct for this new pdt mode, it just print's a debug log instead of error. The return value should be 0 instead of 1 in case _pdt_mode is 1 otherwise it will still not start. <code> if(_pdt_mode & 1) { LM_DBG("prefix already allocated [%.*s/[%.*s] - ignoring\n", sp->len, sp->s, sd->len, sd->s); return -1; } else { LM_ERR("prefix already allocated [%.*s/[%.*s]\n", sp->len, sp->s, sd->len, sd->s); return -1; } </code> ### Troubleshooting #### Reproduction #### Debugging Data #### Log Messages #### SIP Traffic ### Possible Solutions ### Additional Information * **Operating System**: -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3626 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3626(a)github.com>

6 months, 2 weeks

git:master:ef5e889d: pdt: return 0 when add_to_tree() detect duplicated prefix with pdt mode 1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ef5e889dce3e2ff077b300f183b6d3262aeab9f8 URL: https://github.com/kamailio/kamailio/commit/ef5e889dce3e2ff077b300f183b6d32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-02T13:17:17+01:00 pdt: return 0 when add_to_tree() detect duplicated prefix with pdt mode 1 - GH #3626 --- Modified: src/modules/pdt/pdtree.c --- Diff: https://github.com/kamailio/kamailio/commit/ef5e889dce3e2ff077b300f183b6d32… Patch: https://github.com/kamailio/kamailio/commit/ef5e889dce3e2ff077b300f183b6d32… --- diff --git a/src/modules/pdt/pdtree.c b/src/modules/pdt/pdtree.c index b211ca6611d..5e60fe216e9 100644 --- a/src/modules/pdt/pdtree.c +++ b/src/modules/pdt/pdtree.c @@ -121,7 +121,7 @@ int add_to_tree(pdt_tree_t *pt, str *sp, str *sd) if(_pdt_mode & 1) { LM_DBG("prefix already allocated [%.*s/[%.*s] - ignoring\n", sp->len, sp->s, sd->len, sd->s); - return -1; + return 0; } else { LM_ERR("prefix already allocated [%.*s/[%.*s]\n", sp->len, sp->s, sd->len, sd->s);

6 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2023