sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
385 discussions

git:master:d9189306: modules: readme files regenerated - http_client ... [skip ci]

by Kamailio Dev

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

6 months, 2 weeks

[kamailio/kamailio] cdp: Fix for undefined symbols when using older/unsupported OpenSSL (PR #3616)

by mtryfoss

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>

6 months, 2 weeks

git:master:ba72724f: cdp: Fix for undefined symbols when using older/unsupported OpenSSL

by Daniel-Constantin Mierla

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

6 months, 2 weeks

git:master:02dd4e2c: http_client: add information about parameter loading (#3619)

by GitHub

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>

6 months, 2 weeks

[kamailio/kamailio] http_client: add information about parameter loading (PR #3619)

by Benjamin

- Inform that the order of the parameters is important when httpcon is loaded first #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3619 -- Commit Summary -- * http_client: add information about parameter loading -- File Changes -- M src/modules/http_client/doc/http_client_admin.xml (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3619.patch https://github.com/kamailio/kamailio/pull/3619.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3619 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3619(a)github.com>

6 months, 2 weeks

git:master:370991cf: core: accept ws and wss as advertised protocol

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 370991cfab3bd42fe0ca3cbff7dca7b40319f3f4 URL: https://github.com/kamailio/kamailio/commit/370991cfab3bd42fe0ca3cbff7dca7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-02T10:25:52+01:00 core: accept ws and wss as advertised protocol --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/370991cfab3bd42fe0ca3cbff7dca7b… Patch: https://github.com/kamailio/kamailio/commit/370991cfab3bd42fe0ca3cbff7dca7b… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 98effbd9b75..9cfce12ce94 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -629,7 +629,7 @@ extern char *default_routename; %type <sockid> id_lst %type <sockid> phostport %type <sockid> listen_phostport -%type <intval> proto eqproto port +%type <intval> proto eqproto xproto port %type <intval> equalop strop cmpop rve_cmpop rve_equalop %type <intval> uri_type %type <attr> attr_id @@ -753,6 +753,15 @@ eqproto: | WSS { $$=PROTO_WSS; } | STAR { $$=0; } ; +xproto: + UDP { $$=PROTO_UDP; } + | TCP { $$=PROTO_TCP; } + | TLS { $$=PROTO_TLS; } + | SCTP { $$=PROTO_SCTP; } + | WS { $$=PROTO_WS; } + | WSS { $$=PROTO_WSS; } + ; + port: NUMBER { $$=$1; } | STAR { $$=0; } @@ -1665,7 +1674,7 @@ assign_stm: } free_socket_id_lst($3); } - | LISTEN EQUAL id_lst ADVERTISE proto COLON listen_id COLON NUMBER { + | LISTEN EQUAL id_lst ADVERTISE xproto COLON listen_id COLON NUMBER { for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { if (add_listen_advertise_iface( lst_tmp->addr_lst->name, lst_tmp->addr_lst->next, @@ -1705,7 +1714,7 @@ assign_stm: } free_socket_id_lst($3); } - | LISTEN EQUAL id_lst ADVERTISE proto COLON listen_id COLON NUMBER STRNAME STRING { + | LISTEN EQUAL id_lst ADVERTISE xproto COLON listen_id COLON NUMBER STRNAME STRING { for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { if (add_listen_advertise_iface_name(lst_tmp->addr_lst->name, lst_tmp->addr_lst->next, @@ -1732,7 +1741,7 @@ assign_stm: } free_socket_id_lst($3); } - | LISTEN EQUAL id_lst ADVERTISE proto COLON listen_id COLON NUMBER STRNAME STRING VIRTUAL { + | LISTEN EQUAL id_lst ADVERTISE xproto COLON listen_id COLON NUMBER STRNAME STRING VIRTUAL { for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { lst_tmp->flags |= SI_IS_VIRTUAL; if (add_listen_advertise_iface_name(lst_tmp->addr_lst->name,

6 months, 2 weeks

git:master:b9a49de6: modules: readme files regenerated - tm ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b9a49de69c9c184b7b3332a14ffaa85e60205ec2 URL: https://github.com/kamailio/kamailio/commit/b9a49de69c9c184b7b3332a14ffaa85… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-02T09:32:06+01:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/b9a49de69c9c184b7b3332a14ffaa85… Patch: https://github.com/kamailio/kamailio/commit/b9a49de69c9c184b7b3332a14ffaa85…

6 months, 2 weeks

git:master:f8981605: tm: docs for t_reply_error() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f8981605f01c755b963a9045a96e22398cca7201 URL: https://github.com/kamailio/kamailio/commit/f8981605f01c755b963a9045a96e223… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-02T09:29:41+01:00 tm: docs for t_reply_error() function --- Modified: src/modules/tm/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/f8981605f01c755b963a9045a96e223… Patch: https://github.com/kamailio/kamailio/commit/f8981605f01c755b963a9045a96e223… --- diff --git a/src/modules/tm/doc/functions.xml b/src/modules/tm/doc/functions.xml index 7fa0ad83e93..7bcc3a43ccf 100644 --- a/src/modules/tm/doc/functions.xml +++ b/src/modules/tm/doc/functions.xml @@ -369,6 +369,27 @@ t_reply("404", "Not found"); </example> </section> + <section id="tm.f.t_reply_error"> + <title> + <function>t_reply_error()</function> + </title> + <para> + Sends a stateful reply based in internal error code, similar to + sl_send_error() from sl module. + </para> + <para> + This function can be used from REQUEST_ROUTE. + </para> + <example> + <title><function>t_reply_error</function> usage</title> + <programlisting> +... +t_reply_error(); +... + </programlisting> + </example> + </section> + <section id="tm.f.t_send_reply"> <title> <function>t_send_reply(code, reason)</function>

6 months, 2 weeks

git:master:ae0b671c: tm: new function t_reply_error()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ae0b671c30f85d97883c1670928128e6c0d6cac7 URL: https://github.com/kamailio/kamailio/commit/ae0b671c30f85d97883c1670928128e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-02T09:25:39+01:00 tm: new function t_reply_error() - send stateful reply based on internal error code --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/ae0b671c30f85d97883c1670928128e… Patch: https://github.com/kamailio/kamailio/commit/ae0b671c30f85d97883c1670928128e… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 9544e94e71b..bf30639a248 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -112,6 +112,7 @@ static int t_failover_parse_reply_codes(); static int w_t_check(struct sip_msg *msg, char *str, char *str2); static int w_t_lookup_cancel(struct sip_msg *msg, char *str, char *str2); static int w_t_reply(struct sip_msg *msg, char *str, char *str2); +static int w_t_reply_error(struct sip_msg *msg, char *str, char *str2); static int w_t_send_reply(struct sip_msg *msg, char *p1, char *p2); static int w_t_release(struct sip_msg *msg, char *str, char *str2); static int w_t_retransmit_reply(struct sip_msg *p_msg, char *foo, char *bar); @@ -255,6 +256,7 @@ 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_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}, @@ -1591,6 +1593,37 @@ int w_t_reply_wrp(struct sip_msg *msg, unsigned int code, char *txt) return ki_t_reply(msg, code, &reason); } +/** + * kemi function to send reply based on internal error code + */ +static int ki_t_reply_error(sip_msg_t *msg) +{ + char err_buffer[128]; + str reason; + int sip_err; + int ret; + + ret = err2reason_phrase( + prev_ser_error, &sip_err, err_buffer, sizeof(err_buffer), "TM"); + if(ret > 0) { + reason.s = err_buffer; + reason.len = strlen(reason.s); + return ki_t_reply(msg, sip_err, &reason); + } else { + LM_ERR("failed to get internal error reason phrase\n"); + return -1; + } +} + + +/** + * config function to send reply based on internal error code + */ +static int w_t_reply_error(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_t_reply_error(msg); +} + /** * */ @@ -3276,6 +3309,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_reply_error"), + SR_KEMIP_INT, ki_t_reply_error, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_send_reply"), SR_KEMIP_INT, ki_t_send_reply, { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE,

6 months, 2 weeks

git:master:c76444da: tm: update return code for EoH check failure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c76444da502325c90eb7ac0cbcc24e7bf16dd5d1 URL: https://github.com/kamailio/kamailio/commit/c76444da502325c90eb7ac0cbcc24e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-01T08:56:23+01:00 tm: update return code for EoH check failure --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/c76444da502325c90eb7ac0cbcc24e7… Patch: https://github.com/kamailio/kamailio/commit/c76444da502325c90eb7ac0cbcc24e7… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index bfb18d6cbf3..0ac9f6773d9 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1903,7 +1903,7 @@ int t_newtran(struct sip_msg *p_msg) } if((p_msg->parsed_flag & HDR_EOH_F) != HDR_EOH_F) { LM_ERR("EoH not parsed\n"); - return E_OUT_OF_MEM; + return E_UNEXPECTED_STATE; } /* t_lookup_requests attempts to find the transaction; * it also calls check_transaction_quadruple -> it is

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