sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
391 discussions

git:master:cb529523: sl: docs for send_reply_error()
by Daniel-Constantin Mierla 03 Nov '23

03 Nov '23

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>

1 0

git:master:130dc00c: sl: added send_reply_error()
by Daniel-Constantin Mierla 03 Nov '23

03 Nov '23

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,

1 0

git:master:20979227: tm: exposed t_reply_error() to intermodule API
by Daniel-Constantin Mierla 03 Nov '23

03 Nov '23

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);

1 0

git:master:21eeb977: core: add transport parameter for ws/wss advertised proto
by Daniel-Constantin Mierla 02 Nov '23

02 Nov '23

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; \

1 0

[kamailio/kamailio] wrong code for new mod param of pdt module (Issue #3626)
by doktorsip 02 Nov '23

02 Nov '23

### 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>

2 2

git:master:ef5e889d: pdt: return 0 when add_to_tree() detect duplicated prefix with pdt mode 1
by Daniel-Constantin Mierla 02 Nov '23

02 Nov '23

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);

1 0

git:master:d9189306: modules: readme files regenerated - http_client ... [skip ci]
by Kamailio Dev 02 Nov '23

02 Nov '23

Module: kamailio Branch: master Commit: d9189306f38e8f79c16e3a9ea38a2fe90fc82fb7 URL: https://github.com/kamailio/kamailio/commit/d9189306f38e8f79c16e3a9ea38a2fe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-02T13:16:27+01:00 modules: readme files regenerated - http_client ... [skip ci] --- Modified: src/modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/d9189306f38e8f79c16e3a9ea38a2fe… Patch: https://github.com/kamailio/kamailio/commit/d9189306f38e8f79c16e3a9ea38a2fe… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index e10556dad09..6ffe4cab0cd 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -266,6 +266,13 @@ Chapter 1. Admin Guide 3.20. config_file (string) 3.21. netinterface (string) + The parameters are loaded in order. That can lead to unexpected + behavior: If httpcon is set at first, the default values for all other + parameters are used, and not the values that might be set after + httpcon. For example, if setting verify_peer=0 or verify_host=0 after + httpcon, the certificates are checked and self-signed certificates are + rejected nevertheless. + 3.1. httpredirect (int) If set to 1, enabled, http_client will follow HTTP 302 Redirects. If

1 0

[kamailio/kamailio] cdp: Fix for undefined symbols when using older/unsupported OpenSSL (PR #3616)
by mtryfoss 02 Nov '23

02 Nov '23

This was originaly fixed in #3601, but that did not handle the change in #3612 very well.   #### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fix for undefined symbols when using older/unsupported OpenSSL. This was originaly fixed in #3601, but that did not handle the change in #3612 very well. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3616 -- Commit Summary -- * cdp: Fix for undefined symbols when using older/unsupported OpenSSL -- File Changes -- M src/modules/cdp/receiver.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3616.patch https://github.com/kamailio/kamailio/pull/3616.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3616 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3616(a)github.com>

3 7

git:master:ba72724f: cdp: Fix for undefined symbols when using older/unsupported OpenSSL
by Daniel-Constantin Mierla 02 Nov '23

02 Nov '23

Module: kamailio Branch: master Commit: ba72724fd1c3547feccb56ae68bd8bed11a3d19a URL: https://github.com/kamailio/kamailio/commit/ba72724fd1c3547feccb56ae68bd8be… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-02T13:10:44+01:00 cdp: Fix for undefined symbols when using older/unsupported OpenSSL This was originaly fixed in #3601, but that did not handle the change in #3612 very well. --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/ba72724fd1c3547feccb56ae68bd8be… Patch: https://github.com/kamailio/kamailio/commit/ba72724fd1c3547feccb56ae68bd8be… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 223d14dd403..17200cf8143 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -533,6 +533,7 @@ void receiver_process(peer *p) static inline int do_read(serviced_peer_t *sp, char *dst, int n) { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int cnt, ssl_err; char *err_str; @@ -547,6 +548,11 @@ static inline int do_read(serviced_peer_t *sp, char *dst, int n) } else { cnt = recv(sp->tcp_socket, dst, n, 0); } +#else + int cnt; + + cnt = recv(sp->tcp_socket, dst, n, 0); +#endif return cnt; } @@ -684,6 +690,7 @@ static inline int do_receive(serviced_peer_t *sp) static int do_write(serviced_peer_t *sp, const void *buf, int num) { +#if OPENSSL_VERSION_NUMBER >= 0x10100000L int cnt, ssl_err; char *err_str; @@ -698,6 +705,11 @@ static int do_write(serviced_peer_t *sp, const void *buf, int num) } else { cnt = write(sp->tcp_socket, buf, num); } +#else + int cnt; + + cnt = write(sp->tcp_socket, buf, num); +#endif return cnt; }

1 0

git:master:02dd4e2c: http_client: add information about parameter loading (#3619)
by GitHub 02 Nov '23

02 Nov '23

Module: kamailio Branch: master Commit: 02dd4e2c883585601f4dbcea0b63b858b4dd24d6 URL: https://github.com/kamailio/kamailio/commit/02dd4e2c883585601f4dbcea0b63b85… Author: Benjamin <92934023+tietzsg(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2023-11-02T13:09:57+01:00 http_client: add information about parameter loading (#3619) * http_client: add information about parameter loading - Inform that the order of the parameters is important when httpcon is loaded first * http_client: docs - typos from previous commit --------- Co-authored-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- Modified: src/modules/http_client/doc/http_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/02dd4e2c883585601f4dbcea0b63b85… Patch: https://github.com/kamailio/kamailio/commit/02dd4e2c883585601f4dbcea0b63b85… --- diff --git a/src/modules/http_client/doc/http_client_admin.xml b/src/modules/http_client/doc/http_client_admin.xml index 1449dc824d8..0e182cc95e3 100644 --- a/src/modules/http_client/doc/http_client_admin.xml +++ b/src/modules/http_client/doc/http_client_admin.xml @@ -88,6 +88,13 @@ <section> <title>Parameters</title> + <para> + The parameters are loaded in order. That can lead to unexpected behavior: + If httpcon is set at first, the default values for all other parameters are used, + and not the values that might be set after httpcon. + For example, if setting verify_peer=0 or verify_host=0 after httpcon, + the certificates are checked and self-signed certificates are rejected nevertheless. + </para> <section id="http_client.p.httpredirect"> <title><varname>httpredirect</varname> (int)</title> <para>

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 November 2023