sr-dev January 2024

sr-dev@lists.kamailio.org

19 participants
315 discussions

git:master:ff54f183: sdpops: added sdp line interator functions and variables
by Daniel-Constantin Mierla 29 Jan '24

29 Jan '24

Module: kamailio Branch: master Commit: ff54f183cdedded4ef9d24d055c755b770b07651 URL: https://github.com/kamailio/kamailio/commit/ff54f183cdedded4ef9d24d055c755b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-29T09:49:49+01:00 sdpops: added sdp line interator functions and variables - walk sdb lines in the message body (also for multipart body) - append/insert/remove line of the current iterator - variable to get the value of the curent iterator --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ff54f183cdedded4ef9d24d055c755b… Patch: https://github.com/kamailio/kamailio/commit/ff54f183cdedded4ef9d24d055c755b…

1 0

git:master:7b676473: textopsx: reformat module exported structures
by Daniel-Constantin Mierla 29 Jan '24

29 Jan '24

Module: kamailio Branch: master Commit: 7b676473d2193b34ba59600eb3ce9c5acd19da1b URL: https://github.com/kamailio/kamailio/commit/7b676473d2193b34ba59600eb3ce9c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-29T09:49:49+01:00 textopsx: reformat module exported structures --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7b676473d2193b34ba59600eb3ce9c5… Patch: https://github.com/kamailio/kamailio/commit/7b676473d2193b34ba59600eb3ce9c5…

1 0

Make dlg_dmq_replicate_action() available from config
by Stefan-Cristian Mititelu 29 Jan '24

29 Jan '24

Hello, I am thinking of making dlg_dmq_replicate_action() available to be called from config, so one can do the following on the DMQ peer node: def ksr_reply_route(self, msg): if KSR.tm.t_check_trans() < 0: if KSR.dialog.is_known_dlg(): if KSR.pv.get("$rs") == "180": KSR.dialog.dlg_dmq_replicate_action(DLG_STATE_EARLY, dlg, 0, 0) else if KSR.pv.get("$rs") == "200": KSR.dialog.dlg_dmq_replicate_action(DLG_STATE_CONFIRMED, dlg, 0, 0) Similar for BYEs, but I have to check that: KSR.dialog.dlg_dmq_replicate_action(DLG_STATE_DELETED, dlg, 0, 0) Is this a good idea? Or someone can see some issues with that? Thanks, Stefan

3 4

git:master:0f963a7a: tls_wolfssl: clang-format
by S-P Chan 29 Jan '24

29 Jan '24

Module: kamailio Branch: master Commit: 0f963a7a1e2aca28611c2238f4c29180a0acd320 URL: https://github.com/kamailio/kamailio/commit/0f963a7a1e2aca28611c2238f4c2918… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-29T11:26:35+08:00 tls_wolfssl: clang-format --- Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_rpc.c Modified: src/modules/tls_wolfssl/tls_select.c Modified: src/modules/tls_wolfssl/tls_server.c Modified: src/modules/tls_wolfssl/tls_util.h --- Diff: https://github.com/kamailio/kamailio/commit/0f963a7a1e2aca28611c2238f4c2918… Patch: https://github.com/kamailio/kamailio/commit/0f963a7a1e2aca28611c2238f4c2918…

1 0

git:5.7:8e915d44: tls_wolfssl: clean-up; continue to remove OpenSSL-isms
by S-P Chan 27 Jan '24

27 Jan '24

Module: kamailio Branch: 5.7 Commit: 8e915d440293df2ba3b2700e5a4705123925be9a URL: https://github.com/kamailio/kamailio/commit/8e915d440293df2ba3b2700e5a47051… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-25T07:01:37+08:00 tls_wolfssl: clean-up; continue to remove OpenSSL-isms (cherry-pick from 5d3c11c5e0854ce74424a10a88b0cca4453cee75) --- Modified: src/modules/tls_wolfssl/tls_domain.c Modified: src/modules/tls_wolfssl/tls_select.c Modified: src/modules/tls_wolfssl/tls_verify.c Modified: src/modules/tls_wolfssl/tls_verify.h Modified: src/modules/tls_wolfssl/tls_wolfssl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8e915d440293df2ba3b2700e5a47051… Patch: https://github.com/kamailio/kamailio/commit/8e915d440293df2ba3b2700e5a47051…

2 1

git:5.7:2e6e879a: tls_wolfssl: fix ring buffer write
by S-P Chan 26 Jan '24

26 Jan '24

Module: kamailio Branch: 5.7 Commit: 2e6e879adc949b52cd2824fa233db901e5d045bc URL: https://github.com/kamailio/kamailio/commit/2e6e879adc949b52cd2824fa233db90… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-27T07:19:11+08:00 tls_wolfssl: fix ring buffer write (cherry-pick from 04ca08d0da622519578c479664a85563ec6db483) --- Modified: src/modules/tls_wolfssl/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/2e6e879adc949b52cd2824fa233db90… Patch: https://github.com/kamailio/kamailio/commit/2e6e879adc949b52cd2824fa233db90… --- diff --git a/src/modules/tls_wolfssl/tls_server.c b/src/modules/tls_wolfssl/tls_server.c index 730b7524475..8b5006c4780 100644 --- a/src/modules/tls_wolfssl/tls_server.c +++ b/src/modules/tls_wolfssl/tls_server.c @@ -637,6 +637,7 @@ void tls_h_tcpconn_clean_f(struct tcp_connection *c) * wolfSSL implementation detail: BIO pair uses a ring buffer - * wolfSSL_BIO_read does not do wrap-around; you may need a 2-pass read * 1st read - front of buffer, 2nd read - wrap-around + * fixed in 4f1d777090 post-v5.6.6-stable */ void tls_h_tcpconn_close_f(struct tcp_connection *c, int fd) @@ -1040,7 +1041,16 @@ int tls_h_read_f(struct tcp_connection *c, rd_conn_flags_t *flags) goto error; } rd_pending = bytes_read; - nw = wolfSSL_BIO_write(rwbio, rd_buf, rd_pending); + /* + * use 2-pass write for wolfSSL ring buffer + * fixed in 4f1d777090, post-v5.6.6-stable + */ + for(nw = 0; nw < rd_pending; ) { + npos = wolfSSL_BIO_write(rwbio, rd_buf+nw, rd_pending-nw); + if(npos<=0) + break; + nw += npos; + } assert(nw==rd_pending); } continue_ssl_read:

1 0

git:master:04ca08d0: tls_wolfssl: fix ring buffer write
by S-P Chan 26 Jan '24

26 Jan '24

Module: kamailio Branch: master Commit: 04ca08d0da622519578c479664a85563ec6db483 URL: https://github.com/kamailio/kamailio/commit/04ca08d0da622519578c479664a8556… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-01-27T07:09:19+08:00 tls_wolfssl: fix ring buffer write --- Modified: src/modules/tls_wolfssl/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/04ca08d0da622519578c479664a8556… Patch: https://github.com/kamailio/kamailio/commit/04ca08d0da622519578c479664a8556… --- diff --git a/src/modules/tls_wolfssl/tls_server.c b/src/modules/tls_wolfssl/tls_server.c index 730b7524475..8b5006c4780 100644 --- a/src/modules/tls_wolfssl/tls_server.c +++ b/src/modules/tls_wolfssl/tls_server.c @@ -637,6 +637,7 @@ void tls_h_tcpconn_clean_f(struct tcp_connection *c) * wolfSSL implementation detail: BIO pair uses a ring buffer - * wolfSSL_BIO_read does not do wrap-around; you may need a 2-pass read * 1st read - front of buffer, 2nd read - wrap-around + * fixed in 4f1d777090 post-v5.6.6-stable */ void tls_h_tcpconn_close_f(struct tcp_connection *c, int fd) @@ -1040,7 +1041,16 @@ int tls_h_read_f(struct tcp_connection *c, rd_conn_flags_t *flags) goto error; } rd_pending = bytes_read; - nw = wolfSSL_BIO_write(rwbio, rd_buf, rd_pending); + /* + * use 2-pass write for wolfSSL ring buffer + * fixed in 4f1d777090, post-v5.6.6-stable + */ + for(nw = 0; nw < rd_pending; ) { + npos = wolfSSL_BIO_write(rwbio, rd_buf+nw, rd_pending-nw); + if(npos<=0) + break; + nw += npos; + } assert(nw==rd_pending); } continue_ssl_read:

1 0

git:master:c286baca: modules: readme files regenerated - sdpops ... [skip ci]
by Kamailio Dev 26 Jan '24

26 Jan '24

Module: kamailio Branch: master Commit: c286bacad82b84165753187a326952573fe5fc7a URL: https://github.com/kamailio/kamailio/commit/c286bacad82b84165753187a3269525… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-01-26T11:16:15+01:00 modules: readme files regenerated - sdpops ... [skip ci] --- Modified: src/modules/sdpops/README --- Diff: https://github.com/kamailio/kamailio/commit/c286bacad82b84165753187a3269525… Patch: https://github.com/kamailio/kamailio/commit/c286bacad82b84165753187a3269525… --- diff --git a/src/modules/sdpops/README b/src/modules/sdpops/README index 74aa3dc1950..d087a2314ee 100644 --- a/src/modules/sdpops/README +++ b/src/modules/sdpops/README @@ -529,6 +529,8 @@ if(is_method("INVITE") && has_body("application/sdp")){ * $sdp(sess_version) - sess-version -attribute from SDP o= -line. When set to special value -1, current value is incremented. (read + write) + * $sdp(c:ip) - connection IP (read only) - taken from first media + strea if specified, otherwise from first session. Exported pseudo-variables are also documented at https://www.kamailio.org/wikidocs/

1 0

git:master:46e37273: sdpops: docs - listed $sdp(c:ip) variable
by Daniel-Constantin Mierla 26 Jan '24

26 Jan '24

Module: kamailio Branch: master Commit: 46e3727368f7e801b3731272d219cefdceebadde URL: https://github.com/kamailio/kamailio/commit/46e3727368f7e801b3731272d219cef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-26T11:06:15+01:00 sdpops: docs - listed $sdp(c:ip) variable --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/46e3727368f7e801b3731272d219cef… Patch: https://github.com/kamailio/kamailio/commit/46e3727368f7e801b3731272d219cef… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index 0bd00c5c942..746b051f017 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -608,7 +608,14 @@ if(is_method("INVITE") && has_body("application/sdp")){ <emphasis>$sdp(body)</emphasis> - full SDP body (read only) </para></listitem> <listitem><para> - <emphasis>$sdp(sess_version)</emphasis> - sess-version -attribute from SDP o= -line. When set to special value -1, current value is incremented. (read + write) + <emphasis>$sdp(sess_version)</emphasis> - sess-version -attribute + from SDP o= -line. When set to special value -1, current value + is incremented. (read + write) + </para></listitem> + <listitem><para> + <emphasis>$sdp(c:ip)</emphasis> - connection IP (read only) + - taken from first media strea if specified, otherwise from + first session. </para></listitem> </itemizedlist> <para>

1 0

git:master:faaefbb0: sdpops: added $sdp(c:ip) variable to return connection ip
by Daniel-Constantin Mierla 26 Jan '24

26 Jan '24

Module: kamailio Branch: master Commit: faaefbb02563b8ba0827b23422a363a71259ad1e URL: https://github.com/kamailio/kamailio/commit/faaefbb02563b8ba0827b23422a363a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-01-26T11:06:15+01:00 sdpops: added $sdp(c:ip) variable to return connection ip --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/faaefbb02563b8ba0827b23422a363a… Patch: https://github.com/kamailio/kamailio/commit/faaefbb02563b8ba0827b23422a363a… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 8dd4415c9d1..e3755cc1041 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2053,13 +2053,12 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } switch(param->pvn.u.isname.name.n) { - - /* body */ case 0: + /* body */ LM_DBG("param->pvn.u.isname.name.n=0\n"); return pv_get_strval(msg, param, res, &sdp->raw_sdp); - /* sess_version */ case 1: + /* sess_version */ if(sdp_get_sess_version(msg, &sess_version, &sess_version_num) == 1) { if(sess_version.len > 0 && sess_version.s != NULL) { @@ -2068,6 +2067,34 @@ static int pv_get_sdp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } } return pv_get_null(msg, param, res); + case 2: + /* connection ip */ + if(sdp->sessions == NULL) { + return pv_get_null(msg, param, res); + } + if(sdp->sessions->streams == NULL) { + if(sdp->sessions->ip_addr.s != NULL + && sdp->sessions->ip_addr.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->ip_addr); + } else { + return pv_get_null(msg, param, res); + } + } else { + if(sdp->sessions->streams->ip_addr.s != NULL + && sdp->sessions->streams->ip_addr.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->streams->ip_addr); + } else { + if(sdp->sessions->ip_addr.s != NULL + && sdp->sessions->ip_addr.len > 0) { + return pv_get_strval( + msg, param, res, &sdp->sessions->ip_addr); + } else { + return pv_get_null(msg, param, res); + } + } + } default: return pv_get_null(msg, param, res); @@ -2114,6 +2141,8 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) case 4: if(strncmp(in->s, "body", 4) == 0) sp->pvp.pvn.u.isname.name.n = 0; + if(strncmp(in->s, "c:ip", 4) == 0) + sp->pvp.pvn.u.isname.name.n = 2; else goto error; break;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2024