sr-dev January 2023

sr-dev@lists.kamailio.org

14 participants
279 discussions

git:master:408cad8c: rtp_media_server: reorder code for rms_payload_type_new() to update field after memset

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 408cad8cd67f1c3568fddb0f6b6fcc715ecec181 URL: https://github.com/kamailio/kamailio/commit/408cad8cd67f1c3568fddb0f6b6fcc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:13:11+01:00 rtp_media_server: reorder code for rms_payload_type_new() to update field after memset --- Modified: src/modules/rtp_media_server/rms_sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/408cad8cd67f1c3568fddb0f6b6fcc7… Patch: https://github.com/kamailio/kamailio/commit/408cad8cd67f1c3568fddb0f6b6fcc7… --- diff --git a/src/modules/rtp_media_server/rms_sdp.c b/src/modules/rtp_media_server/rms_sdp.c index b3330f58f0..f263e2622f 100644 --- a/src/modules/rtp_media_server/rms_sdp.c +++ b/src/modules/rtp_media_server/rms_sdp.c @@ -187,8 +187,11 @@ PayloadType * rms_payload_type_new() // This could be problematic as it must remain compatible with the constructor in MS2. { PayloadType *newpayload = (PayloadType *)shm_malloc(sizeof(PayloadType)); - newpayload->flags |= PAYLOAD_TYPE_ALLOCATED; + if(!newpayload) { + return NULL; + } memset(newpayload, 0, sizeof(PayloadType)); + newpayload->flags |= PAYLOAD_TYPE_ALLOCATED; return newpayload; }

1 year, 9 months

git:master:f6dd56c8: rtp_media_server: safety check for shm allocation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f6dd56c8405189d0dcc16bd5d79927e919e8b572 URL: https://github.com/kamailio/kamailio/commit/f6dd56c8405189d0dcc16bd5d79927e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:12:06+01:00 rtp_media_server: safety check for shm allocation --- Modified: src/modules/rtp_media_server/rms_sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/f6dd56c8405189d0dcc16bd5d79927e… Patch: https://github.com/kamailio/kamailio/commit/f6dd56c8405189d0dcc16bd5d79927e… --- diff --git a/src/modules/rtp_media_server/rms_sdp.c b/src/modules/rtp_media_server/rms_sdp.c index c313d13646..b3330f58f0 100644 --- a/src/modules/rtp_media_server/rms_sdp.c +++ b/src/modules/rtp_media_server/rms_sdp.c @@ -251,6 +251,9 @@ PayloadType *rms_sdp_select_payload(rms_sdp_info_t *sdp) char *payloads = sdp->payloads.s; char *payload_type_number = strtok(payloads, " "); + if (!pt) { + return NULL; + } while (payload_type_number) { pt->type = atoi(payload_type_number); pt = rms_sdp_check_payload_type(pt, sdp); @@ -259,7 +262,7 @@ PayloadType *rms_sdp_select_payload(rms_sdp_info_t *sdp) } if (!pt->mime_type) { LM_INFO("unsuported codec\n"); - if (pt) shm_free(pt); // payload_type_destroy(pt); + shm_free(pt); // payload_type_destroy(pt); return NULL; } LM_INFO("payload_type:%d %s/%d/%d\n", pt->type, pt->mime_type,

1 year, 9 months

git:master:19387803: app_python3s: restore backup reference to sip msg

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1938780339677596bf547794c4b54b7923405166 URL: https://github.com/kamailio/kamailio/commit/1938780339677596bf547794c4b54b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T13:07:58+01:00 app_python3s: restore backup reference to sip msg --- Modified: src/modules/app_python3s/apy3s_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/1938780339677596bf547794c4b54b7… Patch: https://github.com/kamailio/kamailio/commit/1938780339677596bf547794c4b54b7… --- diff --git a/src/modules/app_python3s/apy3s_kemi.c b/src/modules/app_python3s/apy3s_kemi.c index 9eb58146e4c..e00eadd8105 100644 --- a/src/modules/app_python3s/apy3s_kemi.c +++ b/src/modules/app_python3s/apy3s_kemi.c @@ -149,6 +149,7 @@ int apy3s_exec_func(sip_msg_t *_msg, char *fname, char *fparam, int emode) rval = (int)PyLong_AsLong(pValue); Py_DECREF(pValue); + _sr_apy_env.msg = bmsg; error: if(locked) {

1 year, 9 months

git:master:db5ec271: rtp_media_server: removed fl variable which is not updated, thus not really used

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: db5ec271134f8c442bcaa91e8adfaaf3c6db5cba URL: https://github.com/kamailio/kamailio/commit/db5ec271134f8c442bcaa91e8adfaaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T12:58:27+01:00 rtp_media_server: removed fl variable which is not updated, thus not really used --- Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/db5ec271134f8c442bcaa91e8adfaaf… Patch: https://github.com/kamailio/kamailio/commit/db5ec271134f8c442bcaa91e8adfaaf… --- diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index e29a43aa4b..ac1e8ba73b 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -941,7 +941,6 @@ static int rms_sip_cancel(struct sip_msg *msg, str *callid_s, str *cseq_s) tm_cell_t *bkt; int bkb; struct cancel_info cancel_data; - int fl = 0; int rcode = 0; bkt = tmb.t_gett(); @@ -955,8 +954,6 @@ static int rms_sip_cancel(struct sip_msg *msg, str *callid_s, str *cseq_s) return 1; } - if(trans->uas.request && fl>0 && fl<32) - setflag(trans->uas.request, fl); init_cancel_info(&cancel_data); cancel_data.reason.cause = rcode; cancel_data.cancel_bitmap = 0;

1 year, 9 months

git:master:72270c67: rtp_media_server: removed unnecessary condition

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 72270c67fa76d653f09c132933460d268645a568 URL: https://github.com/kamailio/kamailio/commit/72270c67fa76d653f09c132933460d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-10T12:51:51+01:00 rtp_media_server: removed unnecessary condition --- Modified: src/modules/rtp_media_server/rtp_media_server.c --- Diff: https://github.com/kamailio/kamailio/commit/72270c67fa76d653f09c132933460d2… Patch: https://github.com/kamailio/kamailio/commit/72270c67fa76d653f09c132933460d2… --- diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index bc528d40a30..e29a43aa4ba 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -944,9 +944,6 @@ static int rms_sip_cancel(struct sip_msg *msg, str *callid_s, str *cseq_s) int fl = 0; int rcode = 0; - if(rcode<100 || rcode>699) - rcode = 0; - bkt = tmb.t_gett(); bkb = tmb.t_gett_branch(); if (tmb.t_lookup_callid(&trans, *callid_s, *cseq_s) < 0 ) {

1 year, 9 months

git:5.5:5671c68a: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.5 Commit: 5671c68a3d043068d9d9fecb5fa12a8d7422f33a URL: https://github.com/kamailio/kamailio/commit/5671c68a3d043068d9d9fecb5fa12a8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-01-09T09:02:40+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/5671c68a3d043068d9d9fecb5fa12a8… Patch: https://github.com/kamailio/kamailio/commit/5671c68a3d043068d9d9fecb5fa12a8… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index 84a7c37eba..7ddf9d8325 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -510,11 +510,11 @@ modparam("p_usrloc", "db_use_transactions", "0") activate transaction the db_use_transactions parameter must be also set. - Default value is ��READ UNCOMMITED��. + Default value is ��READ UNCOMMITTED��. Example 1.17. Set db_transaction_level parameter ... -modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITED") +modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITTED") ... 3.18. write_on_master_db (int)

1 year, 9 months

git:5.6:904cd586: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.6 Commit: 904cd586eff82c6a844cf028cb00652bc0470a0c URL: https://github.com/kamailio/kamailio/commit/904cd586eff82c6a844cf028cb00652… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-01-09T09:02:11+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/904cd586eff82c6a844cf028cb00652… Patch: https://github.com/kamailio/kamailio/commit/904cd586eff82c6a844cf028cb00652… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index 8acd47b616..bf2054a03c 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -514,11 +514,11 @@ modparam("p_usrloc", "db_use_transactions", "0") activate transaction the db_use_transactions parameter must be also set. - Default value is ��READ UNCOMMITED��. + Default value is ��READ UNCOMMITTED��. Example 1.17. Set db_transaction_level parameter ... -modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITED") +modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITTED") ... 3.18. write_on_master_db (int)

1 year, 9 months

git:master:c83d2346: modules: readme files regenerated - p_usrloc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c83d234629c0d34a83926771b6df18438d0f43f1 URL: https://github.com/kamailio/kamailio/commit/c83d234629c0d34a83926771b6df184… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-01-09T09:01:42+01:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/c83d234629c0d34a83926771b6df184… Patch: https://github.com/kamailio/kamailio/commit/c83d234629c0d34a83926771b6df184… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index 439e55c939..351aedd766 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -514,11 +514,11 @@ modparam("p_usrloc", "db_use_transactions", "0") activate transaction the db_use_transactions parameter must be also set. - Default value is ��READ UNCOMMITED��. + Default value is ��READ UNCOMMITTED��. Example 1.17. Set db_transaction_level parameter ... -modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITED") +modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITTED") ... 3.18. write_on_master_db (int)

1 year, 9 months

git:5.5:0622ff34: p_usrloc: fix default transaction isolation level (gh #3324)

by Henning Westerholt

Module: kamailio Branch: 5.5 Commit: 0622ff34dcdded39de06986e36f4758a8319e050 URL: https://github.com/kamailio/kamailio/commit/0622ff34dcdded39de06986e36f4758… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-01-09T07:59:32Z p_usrloc: fix default transaction isolation level (gh #3324) (cherry picked from commit ff647697724decb7440dfe3758857a06ab008979) (cherry picked from commit af7d9413385cd03da918777072e7246863849dbb) --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/0622ff34dcdded39de06986e36f4758… Patch: https://github.com/kamailio/kamailio/commit/0622ff34dcdded39de06986e36f4758… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index 80d4233eeb9..2d8c6eb9762 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -472,14 +472,14 @@ modparam("p_usrloc", "db_use_transactions", "0") </para> <para> <emphasis> - Default value is <quote>READ UNCOMMITED</quote>. + Default value is <quote>READ UNCOMMITTED</quote>. </emphasis> </para> <example> <title>Set <varname>db_transaction_level</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITED") +modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITTED") ... </programlisting> </example> diff --git a/src/modules/p_usrloc/p_usrloc_mod.h b/src/modules/p_usrloc/p_usrloc_mod.h index 24368cf4705..6b0929f39bb 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.h +++ b/src/modules/p_usrloc/p_usrloc_mod.h @@ -61,7 +61,7 @@ #define DB_RETRY 10 #define DB_DEFAULT_POLICY 0 #define DEFAULT_FAILOVER_LEVEL 1 -#define DB_DEFAULT_TRANSACTION_LEVEL "READ UNCOMMITED" +#define DB_DEFAULT_TRANSACTION_LEVEL "READ UNCOMMITTED" #define DB_DEFAULT_CONNECTION_EXPIRES 300 #define DEFAULT_DB_TYPE "single" #define DEFAULT_DOMAIN_DB "location=cluster,cfa=single"

1 year, 9 months

git:5.6:af7d9413: p_usrloc: fix default transaction isolation level (gh #3324)

by Henning Westerholt

Module: kamailio Branch: 5.6 Commit: af7d9413385cd03da918777072e7246863849dbb URL: https://github.com/kamailio/kamailio/commit/af7d9413385cd03da918777072e7246… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-01-09T07:59:04Z p_usrloc: fix default transaction isolation level (gh #3324) (cherry picked from commit ff647697724decb7440dfe3758857a06ab008979) --- Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/af7d9413385cd03da918777072e7246… Patch: https://github.com/kamailio/kamailio/commit/af7d9413385cd03da918777072e7246… --- diff --git a/src/modules/p_usrloc/doc/p_usrloc_admin.xml b/src/modules/p_usrloc/doc/p_usrloc_admin.xml index ca8faa827f9..cab0c3878af 100644 --- a/src/modules/p_usrloc/doc/p_usrloc_admin.xml +++ b/src/modules/p_usrloc/doc/p_usrloc_admin.xml @@ -472,14 +472,14 @@ modparam("p_usrloc", "db_use_transactions", "0") </para> <para> <emphasis> - Default value is <quote>READ UNCOMMITED</quote>. + Default value is <quote>READ UNCOMMITTED</quote>. </emphasis> </para> <example> <title>Set <varname>db_transaction_level</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITED") +modparam("p_usrloc", "db_transaction_level", "READ UNCOMMITTED") ... </programlisting> </example> diff --git a/src/modules/p_usrloc/p_usrloc_mod.h b/src/modules/p_usrloc/p_usrloc_mod.h index bfdcc2f45ca..800a71851a8 100644 --- a/src/modules/p_usrloc/p_usrloc_mod.h +++ b/src/modules/p_usrloc/p_usrloc_mod.h @@ -61,7 +61,7 @@ #define DB_RETRY 10 #define DB_DEFAULT_POLICY 0 #define DEFAULT_FAILOVER_LEVEL 1 -#define DB_DEFAULT_TRANSACTION_LEVEL "READ UNCOMMITED" +#define DB_DEFAULT_TRANSACTION_LEVEL "READ UNCOMMITTED" #define DB_DEFAULT_CONNECTION_EXPIRES 300 #define DEFAULT_DB_TYPE "single" #define DEFAULT_DOMAIN_DB "location=cluster,cfa=single"

1 year, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2023