sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
527 discussions

git:5.4:eae86ff8: textops: fix append_hf function
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: eae86ff8bf327b6ed0bcb83ee25c663cb97a02fc URL: https://github.com/kamailio/kamailio/commit/eae86ff8bf327b6ed0bcb83ee25c663… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:57:59+02:00 textops: fix append_hf function Before: append_hf adds header after first header occurance After: append_hf adds header after last header occurance (cherry picked from commit 4adea97a4f8a9b35273d4d28b0518964abb7f0d8) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/eae86ff8bf327b6ed0bcb83ee25c663… Patch: https://github.com/kamailio/kamailio/commit/eae86ff8bf327b6ed0bcb83ee25c663… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 6dcbeedb0b..7f11999cc0 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3361,7 +3361,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, gparam_p hfval, int mode, gparam_p hfanc) { struct lump* anchor; - struct hdr_field *hf; + struct hdr_field *hf, *append_hf; char *s; int len; str s0; @@ -3372,6 +3372,7 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, } hf = 0; + append_hf = 0; if(hfanc!=NULL) { for (hf=msg->headers; hf; hf=hf->next) { if(hfanc->type==GPARAM_TYPE_INT) @@ -3384,20 +3385,25 @@ int add_hf_helper(struct sip_msg* msg, str *str1, str *str2, if (cmp_hdrname_str(&hf->name,&hfanc->v.str)!=0) continue; } - break; + if (mode == 0) { /* append */ + append_hf = hf; + continue; + } else { /* insert */ + break; + } } } if(mode == 0) { /* append */ - if(hf==0) { /* after last header */ + if(append_hf==0) { /* after last header */ anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); - } else { /* after hf */ - anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); + } else { /* after last hf */ + anchor = anchor_lump(msg, append_hf->name.s + append_hf->len - msg->buf, 0, 0); } } else { /* insert */ if(hf==0) { /* before first header */ anchor = anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); - } else { /* before hf */ + } else { /* before first hf */ anchor = anchor_lump(msg, hf->name.s - msg->buf, 0, 0); } }

1 0

git:5.4:071fe936: utils/pdbt: Relax permissions when creating files
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 071fe9366b3cc14f0cce1aa0373d20a0242182cb URL: https://github.com/kamailio/kamailio/commit/071fe9366b3cc14f0cce1aa0373d20a… Author: Kristian F. HÃ¸gh <kfh(a)uni-tel.dk> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:57:43+02:00 utils/pdbt: Relax permissions when creating files (cherry picked from commit bb42ee28fc115e1e3373962c02162c9a8e6d41fc) --- Modified: utils/pdbt/pdbt.c --- Diff: https://github.com/kamailio/kamailio/commit/071fe9366b3cc14f0cce1aa0373d20a… Patch: https://github.com/kamailio/kamailio/commit/071fe9366b3cc14f0cce1aa0373d20a… --- diff --git a/utils/pdbt/pdbt.c b/utils/pdbt/pdbt.c index 6521985b2b..5a52cf8c7a 100644 --- a/utils/pdbt/pdbt.c +++ b/utils/pdbt/pdbt.c @@ -297,7 +297,7 @@ int dt_write_tree(const struct dt_node_t *root, const char* filename) char number[25]; number[0] = '\0'; - fd = creat(filename, S_IRWXU); + fd = creat(filename, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); if (fd < 0) { LERR("cannot create file '%s'\n", filename); return -1; @@ -370,7 +370,7 @@ int save_mmap(struct dt_node_t *root, char *filename) { int fd; int n; - fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IRWXU); + fd = open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); if (fd < 0) { LERR("cannot create file '%s'\n", filename); return -1;

1 0

git:5.4:39895a53: rtp_media_server: use directly gen_lock_t instead of ser_lock_t which is tm typedef
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 39895a53b7df804573746585b5d0dd9d4a56f209 URL: https://github.com/kamailio/kamailio/commit/39895a53b7df804573746585b5d0dd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:57:32+02:00 rtp_media_server: use directly gen_lock_t instead of ser_lock_t which is tm typedef (cherry picked from commit 3a162187580880fa7210bd376621f57576e9d209) --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/39895a53b7df804573746585b5d0dd9… Patch: https://github.com/kamailio/kamailio/commit/39895a53b7df804573746585b5d0dd9… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index b8c51bada2..841e74a340 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -23,7 +23,7 @@ extern rms_dialog_info_t *rms_dialog_list; extern int in_rms_process; -ser_lock_t dialog_list_mutex; +gen_lock_t dialog_list_mutex; static void rms_action_free(rms_dialog_info_t *si) { diff --git a/src/modules/rtp_media_server/rtp_media_server.h b/src/modules/rtp_media_server/rtp_media_server.h index cd3a0109ce..c23cf0df6e 100644 --- a/src/modules/rtp_media_server/rtp_media_server.h +++ b/src/modules/rtp_media_server/rtp_media_server.h @@ -39,7 +39,7 @@ #include "rms_media.h" #include "rms_dialog_info.h" -extern ser_lock_t dialog_list_mutex; +extern gen_lock_t dialog_list_mutex;

1 0

git:5.4:9f2f517f: rtp_media_server: declare variables in .c files
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 9f2f517ffbc616d14567fcb9948147dae6507da0 URL: https://github.com/kamailio/kamailio/commit/9f2f517ffbc616d14567fcb9948147d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:57:21+02:00 rtp_media_server: declare variables in .c files - extern in .h files, GH #2522 (cherry picked from commit 128ba4fe95f3c27474c9f839d34f8fb1fd75e064) --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rtp_media_server.c Modified: src/modules/rtp_media_server/rtp_media_server.h --- Diff: https://github.com/kamailio/kamailio/commit/9f2f517ffbc616d14567fcb9948147d… Patch: https://github.com/kamailio/kamailio/commit/9f2f517ffbc616d14567fcb9948147d… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index 24fe0bb0c0..b8c51bada2 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -19,9 +19,12 @@ */ #include "rtp_media_server.h" + extern rms_dialog_info_t *rms_dialog_list; extern int in_rms_process; +ser_lock_t dialog_list_mutex; + static void rms_action_free(rms_dialog_info_t *si) { rms_action_t *a, *tmp; diff --git a/src/modules/rtp_media_server/rtp_media_server.c b/src/modules/rtp_media_server/rtp_media_server.c index 8f2b2592aa..99eca96484 100644 --- a/src/modules/rtp_media_server/rtp_media_server.c +++ b/src/modules/rtp_media_server/rtp_media_server.c @@ -36,6 +36,8 @@ static char *rms_answer_default_route = "rms:start"; int in_rms_process; rms_t *rms; +struct tm_binds tmb; + static rms_dialog_info_t *rms_dialog_create_leg(rms_dialog_info_t *di, struct sip_msg *msg); static int fixup_rms_action_play(void **param, int param_no); static int fixup_rms_bridge(void **param, int param_no); diff --git a/src/modules/rtp_media_server/rtp_media_server.h b/src/modules/rtp_media_server/rtp_media_server.h index bf22660b1b..cd3a0109ce 100644 --- a/src/modules/rtp_media_server/rtp_media_server.h +++ b/src/modules/rtp_media_server/rtp_media_server.h @@ -39,7 +39,7 @@ #include "rms_media.h" #include "rms_dialog_info.h" -ser_lock_t dialog_list_mutex; +extern ser_lock_t dialog_list_mutex; @@ -51,7 +51,7 @@ typedef struct rms char *local_ip; } rms_t; -struct tm_binds tmb; +extern struct tm_binds tmb; #endif

1 0

git:5.4:0752f63d: core: Document that a str can be zero-terminated
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 0752f63d41a5c02bc1a5612a22797f186e291119 URL: https://github.com/kamailio/kamailio/commit/0752f63d41a5c02bc1a5612a22797f1… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:57:11+02:00 core: Document that a str can be zero-terminated But by default it isn't. The functions shm_str_dup() and pkg_str_dup() will always create a zero-terminated copy (cherry picked from commit fcdfaf98acf8a66e84b9dccc767fb52c0cf0d460) --- Modified: src/core/str.h --- Diff: https://github.com/kamailio/kamailio/commit/0752f63d41a5c02bc1a5612a22797f1… Patch: https://github.com/kamailio/kamailio/commit/0752f63d41a5c02bc1a5612a22797f1… --- diff --git a/src/core/str.h b/src/core/str.h index 01b12ecb62..58d7d627f6 100644 --- a/src/core/str.h +++ b/src/core/str.h @@ -40,13 +40,16 @@ * need to make a zero-terminated copy of it. * * @section drawbacks Drawbacks - * Note well that the fact that string stored - * using this data structure are not zero terminated makes them a little - * incovenient to use with many standard libc string functions, because these - * usually expect the input to be zero-terminated. In this case you have to - * either make a zero-terminated copy or inject the terminating zero behind - * the actuall string (if possible). Note that injecting a zero terminating - * characters is considered to be dangerous. + * Note well that the fact that a string stored + * using this data structure are not guaranteed to be zero terminated (by + * default they're not) makes them a little incovenient to use with many + * standard libc string functions, because these usually expect the input + * to be zero-terminated. + * In this case you have to either make a zero-terminated copy or inject the + * terminating zero behind the actuall string (if possible). Note that + * injecting a zero terminating characters is considered to be dangerous. + * The functions shm_str_dup() and pkg_str_dup() will always create a + * zero-terminated copy. */ /** @file

1 0

git:5.4:4e509306: core: Zero terminate str copies made with (pkg|shm)_str_dup()
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 4e50930695e288b0285370cc7fd26801cbf751de URL: https://github.com/kamailio/kamailio/commit/4e50930695e288b0285370cc7fd2680… Author: Alex Hermann <alex(a)hexla.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:56:55+02:00 core: Zero terminate str copies made with (pkg|shm)_str_dup() As discussed in #2512, zero-terminating all copies is preferred as most str usage is already with zero-terminated str.s. (cherry picked from commit 0ea69b16db298842f58a6fcaaab2c0ee1a137b94) --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/4e50930695e288b0285370cc7fd2680… Patch: https://github.com/kamailio/kamailio/commit/4e50930695e288b0285370cc7fd2680… --- diff --git a/src/core/ut.h b/src/core/ut.h index 56c1f9e157..51d14d9bb9 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -748,6 +748,7 @@ static inline int strz2sint(char* _s, int* _r) /** * \brief Make a copy of a str structure to a str using shm_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -775,7 +776,7 @@ static inline int shm_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)shm_malloc(dst->len); + dst->s = (char*)shm_malloc(dst->len+1); if (dst->s == NULL) { SHM_MEM_ERROR; return -1; @@ -788,6 +789,7 @@ static inline int shm_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; } @@ -848,6 +850,7 @@ static inline char* shm_str2char_dup(str *src) /** * \brief Make a copy of a str structure using pkg_malloc + * The copy will be zero-terminated * \param dst destination * \param src source * \return 0 on success, -1 on failure @@ -875,7 +878,7 @@ static inline int pkg_str_dup(str* dst, const str* src) dst->len = src->len; } - dst->s = (char*)pkg_malloc(dst->len); + dst->s = (char*)pkg_malloc(dst->len+1); if (dst->s == NULL) { PKG_MEM_ERROR; return -1; @@ -888,6 +891,7 @@ static inline int pkg_str_dup(str* dst, const str* src) } memcpy(dst->s, src->s, dst->len); + dst->s[dst->len] = 0; return 0; }

1 0

git:5.4:f050ce2d: registrar: added note about branch flags in save()/lookup() doc
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: f050ce2dc5f27a08bf5c5364e4002b646802eb81 URL: https://github.com/kamailio/kamailio/commit/f050ce2dc5f27a08bf5c5364e4002b6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:56:28+02:00 registrar: added note about branch flags in save()/lookup() doc (cherry picked from commit f2996bf733a0b5e00fe124440353b9a69a3532a2) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f050ce2dc5f27a08bf5c5364e4002b6… Patch: https://github.com/kamailio/kamailio/commit/f050ce2dc5f27a08bf5c5364e4002b6… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 461605f3d0..266f7b35e2 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1154,7 +1154,8 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 modify location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, <quote>200 OK</quote> will be returned listing all contacts that are currently in - the location database. On an error, an error message will be sent with a short + the location database. As a side effect, also branch flags are + stored in usrloc. On an error, an error message will be sent with a short description in reason phrase. </para> <para>Meaning of the parameters is as follows:</para> @@ -1255,6 +1256,7 @@ save("location", "0x00", "sip:test@kamailio.org"); Request-URI will be overwritten with the contact that has the highest q value and optionally the rest will be appended to the message (depending on append_branches parameter value). + As a side effect, also branch flags are restored from usrloc. </para> <para> If the <varname>method_filtering</varname> option is enabled and

1 0

git:5.4:12ebd41d: permissions: exported allow_trusted() to kemi
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 12ebd41d0dae516f39933eeabcda1919cb10b71e URL: https://github.com/kamailio/kamailio/commit/12ebd41d0dae516f39933eeabcda191… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:56:02+02:00 permissions: exported allow_trusted() to kemi - related to #2509 (cherry picked from commit 843b22b4efb0d343f13230d6e90d2484f370dbdb) --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/12ebd41d0dae516f39933eeabcda191… Patch: https://github.com/kamailio/kamailio/commit/12ebd41d0dae516f39933eeabcda191… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 18cf398f8f..be22963d81 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1058,6 +1058,11 @@ static sr_kemi_t sr_kemi_permissions_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("permissions"), str_init("allow_trusted"), + SR_KEMIP_INT, ki_allow_trusted, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index eed1041581..2f9c7d42a4 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -507,7 +507,7 @@ int allow_trusted(struct sip_msg* msg, char *src_ip, int proto, char *from_uri) * Checks based on request's source address, protocol, and From URI * if request can be trusted without authentication. */ -int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) +int ki_allow_trusted(sip_msg_t* _msg) { str furi; char furi_string[MAX_URI_SIZE+1]; @@ -530,6 +530,15 @@ int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) furi_string); } +/* + * Checks based on request's source address, protocol, and From URI + * if request can be trusted without authentication. + */ +int allow_trusted_0(struct sip_msg* _msg, char* str1, char* str2) +{ + return ki_allow_trusted(_msg); +} + /* * Checks based on source address and protocol given in pvar arguments and * provided uri, if request can be trusted without authentication. diff --git a/src/modules/permissions/trusted.h b/src/modules/permissions/trusted.h index 8a8ab2cc11..72da2d70e7 100644 --- a/src/modules/permissions/trusted.h +++ b/src/modules/permissions/trusted.h @@ -55,6 +55,10 @@ int reload_trusted_table(void); */ void clean_trusted(void); +/* + * Check if request comes from trusted ip address with matching from URI + */ +int ki_allow_trusted(sip_msg_t* _msg); /* * Check if request comes from trusted ip address with matching from URI

1 0

git:5.4:550840b4: pipelimit: use unsigned to compute size and for iterator
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 550840b4b9ce8df9acdf875f907ce86533fea43e URL: https://github.com/kamailio/kamailio/commit/550840b4b9ce8df9acdf875f907ce86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:55:52+02:00 pipelimit: use unsigned to compute size and for iterator (cherry picked from commit 23818fb34d09a487654ea89c9f29b880c0c75197) --- Modified: src/modules/pipelimit/pl_statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/550840b4b9ce8df9acdf875f907ce86… Patch: https://github.com/kamailio/kamailio/commit/550840b4b9ce8df9acdf875f907ce86… --- diff --git a/src/modules/pipelimit/pl_statistics.c b/src/modules/pipelimit/pl_statistics.c index e1afa2ffb8..0c6c52d389 100644 --- a/src/modules/pipelimit/pl_statistics.c +++ b/src/modules/pipelimit/pl_statistics.c @@ -137,10 +137,12 @@ int get_socket_list_from_proto_and_family(int **ipList, int protocol, int family struct socket_info *si; struct socket_info** list; - int num_ip_octets = family == AF_INET ? NUM_IP_OCTETS : NUM_IPV6_OCTETS; - int numberOfSockets = 0; + unsigned int num_ip_octets = 0; + unsigned int numberOfSockets = 0; int currentRow = 0; + num_ip_octets = (family == AF_INET) ? NUM_IP_OCTETS : NUM_IPV6_OCTETS; + /* I hate to use #ifdefs, but this is necessary because of the way * get_sock_info_list() is defined. */ #ifndef USE_TCP @@ -198,7 +200,7 @@ int get_socket_list_from_proto_and_family(int **ipList, int protocol, int family /* Extract out the IP Addresses and ports. */ for(si=list?*list:0; si; si=si->next){ - int i; + unsigned int i; /* We currently only support IPV4. */ if (si->address.af != family) {

1 0

git:5.4:41b6be63: nsq: remove unused defs.h file
by Daniel-Constantin Mierla 23 Oct '20

23 Oct '20

Module: kamailio Branch: 5.4 Commit: 41b6be639eb56dbb9732e1961b75654a73ee2fa6 URL: https://github.com/kamailio/kamailio/commit/41b6be639eb56dbb9732e1961b75654… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-23T10:55:37+02:00 nsq: remove unused defs.h file (cherry picked from commit 79db27575a48c5451b547ece68b5849456e245f9) --- Removed: src/modules/nsq/defs.h --- Diff: https://github.com/kamailio/kamailio/commit/41b6be639eb56dbb9732e1961b75654… Patch: https://github.com/kamailio/kamailio/commit/41b6be639eb56dbb9732e1961b75654…

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020