sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
252 discussions

git:master:756f01ee: pv: use core helper to evaluate changes for pv updated message buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 756f01eecec754726c09a7067e11db9781e35ac1 URL: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 pv: use core helper to evaluate changes for pv updated message buffer --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… Patch: https://github.com/kamailio/kamailio/commit/756f01eecec754726c09a7067e11db9… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 1f998bfc1d3..40557ba4628 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -522,8 +522,6 @@ static str _ksr_pv_msg_buf_updated = STR_NULL; int pv_get_msg_buf_updated( struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - dest_info_t send_info; - if(msg == NULL) return -1; @@ -533,17 +531,7 @@ int pv_get_msg_buf_updated( _ksr_pv_msg_buf_updated.len = 0; } - init_dest_info(&send_info); - send_info.proto = PROTO_UDP; - if(msg->first_line.type == SIP_REPLY) { - _ksr_pv_msg_buf_updated.s = generate_res_buf_from_sip_res(msg, - (unsigned int *)&_ksr_pv_msg_buf_updated.len, - BUILD_NO_VIA1_UPDATE); - } else if(msg->first_line.type == SIP_REQUEST) { - _ksr_pv_msg_buf_updated.s = build_req_buf_from_sip_req(msg, - (unsigned int *)&_ksr_pv_msg_buf_updated.len, &send_info, - BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); - } else { + if(sip_msg_eval_changes(msg, &_ksr_pv_msg_buf_updated) < 0) { return pv_get_null(msg, param, res); }

7 months, 3 weeks

git:master:cad94eb7: core: msg translator - helper function to evaluate changes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cad94eb73c1223ddcf69aa0d073deb3118b46e3f URL: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T13:00:32+02:00 core: msg translator - helper function to evaluate changes --- Modified: src/core/msg_translator.c Modified: src/core/msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… Patch: https://github.com/kamailio/kamailio/commit/cad94eb73c1223ddcf69aa0d073deb3… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index acd5911867a..ab02fb7c47c 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3485,6 +3485,33 @@ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) return 1; } +/** + * evaluate changes and set the output buffer + * - obuf->s has to be pkg freed + * - return: 1 on success, -1 on failure + */ +int sip_msg_eval_changes(sip_msg_t *msg, str *obuf) +{ + dest_info_t dst; + + init_dest_info(&dst); + dst.proto = PROTO_UDP; + if(msg->first_line.type == SIP_REPLY) { + obuf->s = generate_res_buf_from_sip_res( + msg, (unsigned int *)&obuf->len, BUILD_NO_VIA1_UPDATE); + } else { + obuf->s = build_req_buf_from_sip_req(msg, (unsigned int *)&obuf->len, + &dst, + BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); + } + if(obuf->s == NULL) { + LM_ERR("couldn't update msg buffer content\n"); + return -1; + } + + return 1; +} + /** * */ diff --git a/src/core/msg_translator.h b/src/core/msg_translator.h index eac64186d56..9d41b472767 100644 --- a/src/core/msg_translator.h +++ b/src/core/msg_translator.h @@ -173,6 +173,11 @@ void process_lumps(struct sip_msg *msg, struct lump *lumps, char *new_buf, */ int sip_msg_update_buffer(sip_msg_t *msg, str *obuf); +/** + * evaluate changes and set the output buffer + */ +int sip_msg_eval_changes(sip_msg_t *msg, str *obuf); + /** * apply changes to sip msg buffer and reparse */

7 months, 3 weeks

git:master:95f7af6f: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 95f7af6f3aea7ff01fdc06a72703441c4ef320ca URL: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-05T11:31:18+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441… Patch: https://github.com/kamailio/kamailio/commit/95f7af6f3aea7ff01fdc06a72703441…

7 months, 3 weeks

[kamailio/kamailio] DBURL can't read env params (Issue #3800)

by gao114882

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` I want to read params from environment, so define #!defenv MYSQL_IP #!trydef DBURL "mysql://kamailio:kamailio@MYSQL_IP/kamailio" but It can't read this ”MYSQL_IP“。 root@d2e1fcc3f89e:/# env |grep MYSQL* MYSQL_URL=172.16.4.111 MYSQL_IP=172.16.4.111 ``` #### Log Messages  ``` 0(34) ERROR: db_mysql [km_my_con.c:166]: db_mysql_new_connection(): driver error: Unknown server host 'MYSQL_IP' (-2) 0(34) ERROR: <core> [db.c:324]: db_do_init2(): could not add connection to the pool 0(34) ERROR: dispatcher [dispatch.c:955]: ds_connect_db(): cannot initialize db connection 0(34) ERROR: dispatcher [dispatch.c:989]: ds_init_db(): unable to connect to the database 0(34) ERROR: dispatcher [dispatcher.c:439]: mod_init(): could not initiate a connect to the database 0(34) ERROR: <core> [core/sr_module.c:1030]: init_mod(): Error while initializing module dispatcher (/usr/lib/x86_64-linux-gnu/kamailio/modules/dispatcher.so) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.7.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 12.2.0 ``` * **Operating System**:  ``` cat /proc/version Linux version 3.10.0-1160.105.1.el7.x86_64 (mockbuild(a)kbuilder.bsys.centos.org) (gcc version 4.8.5 20150623 (Red Hat 4.8.5-44) (GCC) ) #1 SMP Thu Dec 7 15:39:45 UTC 2023 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3800 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3800(a)github.com>

7 months, 3 weeks

[kamailio/kamailio] Topos breaks early dialog transactions on multi-homed kamailio instances using enable_double_rr and versions >= 5.6.5 (Issue #3757)

by George Diamantopoulos

### Description All kamailio versions on the 5.7.x train and additionally point release 5.6.5 break early dialog transactions, at least when the following conditions are (cumulatively) met: * topos-redis is enabled (haven't tested other storage backends yet, let me know if needed) * kamailio is multihomed * enable_double_rr is enabled (the default) ### Troubleshooting #### SIP Traffic Here's an exchange demonstrating the problem: ``` kamailio instance ──────────┬──────────────────┬───────── internal external peer 172.30.154.1:5060 185.73.43.241:5060 195.167.21.66:5060 ──────────┬──────────────────┬───────── ──────────┬───────── │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ INVITE (SDP) │ │ │ ──────────────────────────> │ │ │ 100 Trying │ │ │ <────────────────────────── │ │ │ 183 Session Progress (SDP) │ │ │ <────────────────────────── │ │ │ PRACK │ │ │ ──────────────────────────> │ │ │ 200 OK │ │ │ <────────────────────────── │ │ │ UPDATE (SDP) │ UPDATE (SDP) │ │ <─────────────────────────── │ │ ``` Whereas the expected behaviour should be: ``` │ │ UPDATE (SDP) │ | <────────────────────────── │ UPDATE (SDP)│ │ │ <───────── │ │ │ ``` This is also exemplified by examining the Via headers as rewritten by kamailio. Not working (>= 5.6.5, 5.7.x): * Inbound Via: `Via: SIP/2.0/UDP 195.167.21.66:5060;branch=z9hG4bKtjlwcpvfh03epe0thhtjhq3qg;Role=3;Hpt=8e58_16` * Oubound Via: `Via: SIP/2.0/UDP 185.73.43.241;branch=z9hG4bK66c4.3453dd9a219858819d528b9da671e39e.0` Working (5.6.4): * Inbound Via: `Via: SIP/2.0/UDP 195.167.21.66:5060;branch=z9hG4bK8lj1ahz6npz65khd8jkzl1ohh;Role=3;Hpt=8e68_16` * Oubound Via: `Via: SIP/2.0/UDP 172.30.154.1;branch=z9hG4bK4dce.4f5448efd64465fa5dbaf5eef0dc35b7.0` ### Possible Solutions Only solution I have found so far is to downgrade to kamailio 5.6.4  ### Additional Information ``` version: kamailio 5.7.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` But I have also tested all 5.7.x versions, which are all affected, as well 5.6.5. * **Operating System**:  ``` Linux host 5.10.0-27-amd64 #1 SMP Debian 5.10.205-2 (2023-12-31) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3757 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3757(a)github.com>

7 months, 3 weeks

git:master:8330158b: rtpengine: docs for write_sdp_pv_mode parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8330158b88815f28326fc5293831c83cebc2e41c URL: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T11:06:53+02:00 rtpengine: docs for write_sdp_pv_mode parameter --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… Patch: https://github.com/kamailio/kamailio/commit/8330158b88815f28326fc5293831c83… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 6d79abfaeff..f898aa32979 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -478,6 +478,32 @@ route { </example> </section> + <section id="rtpengine.p.write_sdp_pv_mode"> + <title><varname>write_sdp_pv_mode</varname> (int)</title> + <para> + If this parameter is set to 1, the returned SDP is written to pv + and also set to message body. + </para> + <para> + Default value: 0 (write SDP only to pv). + </para> + <example> + <title>Set <varname>write_sdp_pv_mode</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "write_sdp_pv", "$avp(sdp)") +modparam("rtpengine", "write_sdp_pv_mode", 1) +... +route { + ... + rtpengine_manage(); + xinfo("new sdp: $avp(sdp)\n"); +} +</programlisting> + </example> + </section> + + <section id="rtpengine.p.rtp_inst_pvar"> <title><varname>rtp_inst_pvar</varname> (string)</title> <para>

7 months, 3 weeks

git:master:664190b3: rtpengine: added param write_sdp_pv_mode

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 664190b31303b52728f957113d97bd77a7ab4f8d URL: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T10:55:09+02:00 rtpengine: added param write_sdp_pv_mode - if set to 1, write the returned sdp in pv and set the body - default 0, write only in pv (existing behaviour so far) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… Patch: https://github.com/kamailio/kamailio/commit/664190b31303b52728f957113d97bd7… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 8a2f9f82d89..c51b4742081 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -322,6 +322,7 @@ static int_str setid_avp; static str write_sdp_pvar_str = {NULL, 0}; static pv_spec_t *write_sdp_pvar = NULL; +static int write_sdp_pvar_mode = 0; static str read_sdp_pvar_str = {NULL, 0}; static pv_spec_t *read_sdp_pvar = NULL; @@ -504,6 +505,7 @@ static param_export_t params[] = { {"force_send_interface", PARAM_STRING, &force_send_ip_str}, {"rtp_inst_pvar", PARAM_STR, &rtp_inst_pv_param}, {"write_sdp_pv", PARAM_STR, &write_sdp_pvar_str}, + {"write_sdp_pv_mode", PARAM_INT, &write_sdp_pvar_mode}, {"read_sdp_pv", PARAM_STR, &read_sdp_pvar_str}, {"hash_table_tout", INT_PARAM, &hash_table_tout}, {"hash_table_size", INT_PARAM, &hash_table_size}, @@ -4708,9 +4710,11 @@ static int rtpengine_offer_answer( goto error_free; } - pkg_free(newbody.s); - - } else { + if(write_sdp_pvar_mode == 0) { + pkg_free(newbody.s); + } + } + if(write_sdp_pvar == NULL || write_sdp_pvar_mode != 0) { if(cl_field.len) { anchor = del_lump(msg, cl_field.s - msg->buf, cl_field.len, 0); cl_repl.s = pkg_malloc(10);

7 months, 3 weeks

[kamailio/kamailio] app_python module still needs Python 2 (Issue #3805)

by waarmond

I'm trying to build current git sources on ArchLinux. `modules/app_python/Makefile` still asks for python2: ``` which: no python2 in ($PATH) which: no python2.7 in ($PATH) File "<string>", line 1 import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBDIR') ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SyntaxError: Missing parentheses in call to 'print'. Did you mean print(...)? ``` Is this intended? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3805 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3805(a)github.com>

7 months, 3 weeks

git:master:30f620ae: sdpops: use find_sdp_line_start() to find start of attribute line

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 30f620ae2254888c0d8d7edc375cb312e33de124 URL: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T08:23:29+02:00 sdpops: use find_sdp_line_start() to find start of attribute line --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… Patch: https://github.com/kamailio/kamailio/commit/30f620ae2254888c0d8d7edc375cb31… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 30de5dfc543..f40062420a7 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2059,6 +2059,9 @@ int bind_sdpops(struct sdpops_binds *sob) return 0; } +/** + * + */ int sdpops_attr_val(str *payload, str *attr, str *val) { char *sline; @@ -2066,16 +2069,9 @@ int sdpops_attr_val(str *payload, str *attr, str *val) val->s = NULL; val->len = 0; - sline = find_sdp_line(payload->s, payload->s + payload->len, attr->s[0]); + sline = find_sdp_line_start( + payload->s, payload->s + payload->len, attr->s[0], 0); while(sline != NULL) { - /* check start of line */ - if(sline > payload->s) { - if(eline[-1] != '\n' && eline[-1] != '\r') { - sline = find_next_sdp_line( - sline, payload->s + payload->len, attr->s[0], NULL); - continue; - } - } /* find EoL or EoData */ eline = sline; while(eline < payload->s + payload->len) {

7 months, 3 weeks

git:master:368661cc: core: parser/sdp - function to find sdp line with start EoL check option

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 368661cc15251af4cbf295d1f5fad5a42d1b647b URL: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-05T08:10:11+02:00 core: parser/sdp - function to find sdp line with start EoL check option --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/parser/sdp/sdp_helpr_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… Patch: https://github.com/kamailio/kamailio/commit/368661cc15251af4cbf295d1f5fad5a… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index d5cb359b40f..a5dffd9c398 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -733,9 +733,10 @@ int extract_sess_version(str *oline, str *sess_version) /* * Auxiliary for some functions. + * - smode: if 1, pstart is pointing inside msg body * Returns pointer to first character of found line, or NULL if no such line. */ -char *find_sdp_line(char *pstart, char *plimit, char linechar) +char *find_sdp_line_start(char *pstart, char *plimit, char linechar, int smode) { static char linehead[3] = "x="; char *cp, *cp1; @@ -749,11 +750,14 @@ char *find_sdp_line(char *pstart, char *plimit, char linechar) if(cp1 == NULL) return NULL; /* - * As it is body, we assume it has previous line and we can - * lookup previous character. + * smode==1 means it is msg body, thus it has previous line and it can + * lookup previous character even when cp1==pstart. */ - if(cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; + if(cp1 > pstart || smode == 1) { + if(cp1[-1] == '\n' || cp1[-1] == '\r') { + return cp1; + } + } /* * Having such data, but not at line beginning. * Skip them and reiterate. ser_memmem() will find next @@ -765,6 +769,14 @@ char *find_sdp_line(char *pstart, char *plimit, char linechar) } } +/* + * Auxiliary for some functions - expect pstart to point inside SIP message body. + * Returns pointer to first character of found line, or NULL if no such line. + */ +char *find_sdp_line(char *pstart, char *plimit, char linechar) +{ + return find_sdp_line_start(pstart, plimit, linechar, 1); +} /* This function assumes pstart points to a line of requested type. */ char *find_next_sdp_line( diff --git a/src/core/parser/sdp/sdp_helpr_funcs.h b/src/core/parser/sdp/sdp_helpr_funcs.h index e8ce6f7e60a..20d3ebd882d 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.h +++ b/src/core/parser/sdp/sdp_helpr_funcs.h @@ -65,6 +65,7 @@ int extract_accept_wrapped_types(str *body, str *accept_wrapped_types); int extract_max_size(str *body, str *max_size); int extract_path(str *body, str *path); +char *find_sdp_line_start(char *pstart, char *plimit, char linechar, int smode); char *find_sdp_line(char *p, char *plimit, char linechar); char *find_next_sdp_line(char *p, char *plimit, char linechar, char *defptr);

7 months, 3 weeks

← Newer
1
...
17
18
19
20
21
22
23
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024