sr-dev October 2019

sr-dev@lists.kamailio.org

22 participants
436 discussions

git:5.2:8c70c16d: app_perl: first destroy old interpreter before creating the new one

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 8c70c16d10ed46f4ba8cf002a5b1599a02b5cb93 URL: https://github.com/kamailio/kamailio/commit/8c70c16d10ed46f4ba8cf002a5b1599… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:43:18+02:00 app_perl: first destroy old interpreter before creating the new one - on interpreter reset, the new one may inherit globals from the old one, if that is not yet destroyed (cherry picked from commit 58047ba61d0cbceebc8c85590970a573fc396aa5) --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8c70c16d10ed46f4ba8cf002a5b1599… Patch: https://github.com/kamailio/kamailio/commit/8c70c16d10ed46f4ba8cf002a5b1599… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 785d4c39b0..3112f9acce 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -262,6 +262,8 @@ PerlInterpreter *parser_init(void) { * */ int unload_perl(PerlInterpreter *p) { + /* clean and reset everything */ + PL_perl_destruct_level = 1; perl_destruct(p); perl_free(p); @@ -276,26 +278,26 @@ int unload_perl(PerlInterpreter *p) { */ int perl_reload(void) { - - PerlInterpreter *new_perl; - - new_perl = parser_init(); - - if (new_perl) { + if(my_perl) { unload_perl(my_perl); - my_perl = new_perl; + } + my_perl = parser_init(); + #ifdef PERL_EXIT_DESTRUCT_END - PL_exit_flags |= PERL_EXIT_DESTRUCT_END; + PL_exit_flags |= PERL_EXIT_DESTRUCT_END; #else #warning Perl 5.8.x should be used. Please upgrade. #warning This binary will be unsupported. - PL_exit_flags |= PERL_EXIT_EXPECTED; + PL_exit_flags |= PERL_EXIT_EXPECTED; #endif + + if(my_perl) { + LM_DBG("new perl interpreter initialized\n"); return 0; } else { - return -1; + LM_CRIT("failed to initialize a new perl interpreter - exiting\n"); + exit(-1); } - }

5 years, 2 months

git:5.2:0e22d01b: tls: option to set custom random bytess generator

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 0e22d01b54340009d34db92bafb7da5a82c76cc7 URL: https://github.com/kamailio/kamailio/commit/0e22d01b54340009d34db92bafb7da5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:43:07+02:00 tls: option to set custom random bytess generator - attempt to fix GH #2077 which exposes a crash in the libssl v1.1 default random bytes generator (cherry picked from commit fc542100d85a013272dde869e54173a7d5a062f4) --- Added: src/modules/tls/tls_rand.c Added: src/modules/tls/tls_rand.h Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0e22d01b54340009d34db92bafb7da5… Patch: https://github.com/kamailio/kamailio/commit/0e22d01b54340009d34db92bafb7da5…

5 years, 2 months

git:5.2:fdb54474: pdt: init len variable to avoid using garbage value

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: fdb54474b7a7cbe953f7869be41459650493e551 URL: https://github.com/kamailio/kamailio/commit/fdb54474b7a7cbe953f7869be414596… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:42:45+02:00 pdt: init len variable to avoid using garbage value (cherry picked from commit 47e0649eca286bfc26c39dd1142169fc06eea077) --- Modified: src/modules/pdt/pdtree.c --- Diff: https://github.com/kamailio/kamailio/commit/fdb54474b7a7cbe953f7869be414596… Patch: https://github.com/kamailio/kamailio/commit/fdb54474b7a7cbe953f7869be414596… --- diff --git a/src/modules/pdt/pdtree.c b/src/modules/pdt/pdtree.c index e55f5bdfa5..d0ff43871a 100644 --- a/src/modules/pdt/pdtree.c +++ b/src/modules/pdt/pdtree.c @@ -278,7 +278,6 @@ str* get_domain(pdt_tree_t *pt, str *sp, int *plen) *plen = len; return domain; - } /** @@ -287,7 +286,7 @@ str* get_domain(pdt_tree_t *pt, str *sp, int *plen) str* pdt_get_domain(pdt_tree_t *pl, str* sdomain, str *code, int *plen) { pdt_tree_t *it; - int len; + int len = 0; str *domain=NULL; if(pl==NULL || sdomain==NULL || sdomain->s==NULL || code == NULL @@ -300,13 +299,14 @@ str* pdt_get_domain(pdt_tree_t *pl, str* sdomain, str *code, int *plen) it = pl; while(it!=NULL && str_strcmp(&it->sdomain, sdomain)<0) it = it->next; - + if(it==NULL || str_strcmp(&it->sdomain, sdomain)>0) return NULL; - + domain = get_domain(it, code, &len); if(plen!=NULL) - *plen = len; + *plen = len; + return domain; }

5 years, 2 months

git:5.2:7829be65: speeddial: fix stripping domain prefix

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 7829be6555b1da66a3802b713304cb28a5ff29a3 URL: https://github.com/kamailio/kamailio/commit/7829be6555b1da66a3802b713304cb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:42:31+02:00 speeddial: fix stripping domain prefix - increment the index after the value is adjusted (cherry picked from commit 6861995e417c40e9ab530d4c0bed97c57de184fd) --- Modified: src/modules/speeddial/sdlookup.c --- Diff: https://github.com/kamailio/kamailio/commit/7829be6555b1da66a3802b713304cb2… Patch: https://github.com/kamailio/kamailio/commit/7829be6555b1da66a3802b713304cb2… --- diff --git a/src/modules/speeddial/sdlookup.c b/src/modules/speeddial/sdlookup.c index d9e52bf3cd..e26bc37bb8 100644 --- a/src/modules/speeddial/sdlookup.c +++ b/src/modules/speeddial/sdlookup.c @@ -117,7 +117,6 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_vals[nr_keys].nul = 0; db_vals[nr_keys].val.str_val.s = puri->host.s; db_vals[nr_keys].val.str_val.len = puri->host.len; - nr_keys++; if (dstrip_s.s!=NULL && dstrip_s.len>0 && dstrip_s.len<puri->host.len @@ -126,6 +125,7 @@ int sd_lookup_owner(sip_msg_t* _msg, str* stable, str* sowner) db_vals[nr_keys].val.str_val.s += dstrip_s.len; db_vals[nr_keys].val.str_val.len -= dstrip_s.len; } + nr_keys++; } /* take sd from r-uri */ if (parse_sip_msg_uri(_msg) < 0)

5 years, 2 months

git:5.2:7c219b4a: core: init local structs to avoid use of garbage values

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 7c219b4a7a2e6a8448d72789587ca10f27fcf36c URL: https://github.com/kamailio/kamailio/commit/7c219b4a7a2e6a8448d72789587ca10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:42:17+02:00 core: init local structs to avoid use of garbage values (cherry picked from commit dfe8db758f84f5e88e0cb35b80a65dcd48158897) --- Modified: src/core/forward.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/7c219b4a7a2e6a8448d72789587ca10… Patch: https://github.com/kamailio/kamailio/commit/7c219b4a7a2e6a8448d72789587ca10… --- diff --git a/src/core/forward.c b/src/core/forward.c index a6bf221a79..11933cf132 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -471,6 +471,7 @@ int forward_request(struct sip_msg* msg, str* dst, unsigned short port, prev_send_sock=0; err=0; + memset(&dns_srv_h, 0, sizeof(struct dns_srv_handle)); #endif buf=0; diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index aa5af2b2f4..df57c5faa3 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -420,6 +420,7 @@ static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su) break; default: LM_CRIT("unknown address family %d\n", su->s.sa_family); + memset(ip, 0, sizeof(ip_addr_t)); } }

5 years, 2 months

git:5.2:3bd97b2d: jsonrpcc: removed old todo file

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 3bd97b2ddaf537cad9f937485ec94391f78b17a1 URL: https://github.com/kamailio/kamailio/commit/3bd97b2ddaf537cad9f937485ec9439… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:41:45+02:00 jsonrpcc: removed old todo file (cherry picked from commit fa5f36454f2ef5fb4e55dd05f746430d9786e842) --- Removed: src/modules/jsonrpcc/TODO --- Diff: https://github.com/kamailio/kamailio/commit/3bd97b2ddaf537cad9f937485ec9439… Patch: https://github.com/kamailio/kamailio/commit/3bd97b2ddaf537cad9f937485ec9439… --- diff --git a/src/modules/jsonrpcc/TODO b/src/modules/jsonrpcc/TODO deleted file mode 100644 index f0e19152f1..0000000000 --- a/src/modules/jsonrpcc/TODO +++ /dev/null @@ -1,2 +0,0 @@ -* "Reliable" Notifications (implement using requests, and failover on error; ignore non-error responses) ? -* Implement timout for non-Linux systems

5 years, 2 months

git:5.2:77c4bd32: ims_qos: fixed typo in comments (timout -> timeout)

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 77c4bd3207173f7e43e67e553fb47f1f260c166e URL: https://github.com/kamailio/kamailio/commit/77c4bd3207173f7e43e67e553fb47f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:41:29+02:00 ims_qos: fixed typo in comments (timout -> timeout) (cherry picked from commit a6caed41166e555d7297abbae6017c5c54262662) --- Modified: src/modules/ims_qos/rx_str.c --- Diff: https://github.com/kamailio/kamailio/commit/77c4bd3207173f7e43e67e553fb47f1… Patch: https://github.com/kamailio/kamailio/commit/77c4bd3207173f7e43e67e553fb47f1… --- diff --git a/src/modules/ims_qos/rx_str.c b/src/modules/ims_qos/rx_str.c index efa9617222..6b243e85a4 100644 --- a/src/modules/ims_qos/rx_str.c +++ b/src/modules/ims_qos/rx_str.c @@ -104,8 +104,8 @@ int rx_send_str(str *rx_session_id) { if (auth->u.auth.state == AUTH_ST_DISCON) { // If we are in DISCON is because an STR was already sent - // so just wait for STA or for Grace Timout to happen - LM_DBG("Hmmm, auth session already in disconnected state\n"); + // so just wait for STA or for Grace Timeout to happen + LM_DBG("auth session already in disconnected state\n"); cdpb.AAASessionsUnlock(auth->hash); return CSCF_RETURN_FALSE; }

5 years, 2 months

git:5.2:342e1dcd: sms: fixed typo in comments (timout -> timeout)

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 342e1dcdd8d59269efe93f4c3e7651d4019e2dd5 URL: https://github.com/kamailio/kamailio/commit/342e1dcdd8d59269efe93f4c3e7651d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:41:19+02:00 sms: fixed typo in comments (timout -> timeout) (cherry picked from commit 5631338036c405b1e8c7fe8a1e320db2eb63c3f9) --- Modified: src/modules/sms/libsms_modem.c Modified: src/modules/sms/libsms_modem.h --- Diff: https://github.com/kamailio/kamailio/commit/342e1dcdd8d59269efe93f4c3e7651d… Patch: https://github.com/kamailio/kamailio/commit/342e1dcdd8d59269efe93f4c3e7651d… --- diff --git a/src/modules/sms/libsms_modem.c b/src/modules/sms/libsms_modem.c index 5093d28ee2..fe0be1f8a7 100644 --- a/src/modules/sms/libsms_modem.c +++ b/src/modules/sms/libsms_modem.c @@ -125,7 +125,7 @@ int put_command( struct modem *mdm, char* cmd, int cmd_len, char* answer, } } } - /* repeat until timout */ + /* repeat until timeout */ }while (timeoutcounter<timeout); if (!answer_e) diff --git a/src/modules/sms/libsms_modem.h b/src/modules/sms/libsms_modem.h index feeb6acac9..7eb0a80b04 100644 --- a/src/modules/sms/libsms_modem.h +++ b/src/modules/sms/libsms_modem.h @@ -31,7 +31,7 @@ typedef int(*cds_report)( struct modem* , char* , int ); /* put_command - Sends a command to the modem and waits max timout*0.1 seconds for an answer. + Sends a command to the modem and waits max timeout*0.1 seconds for an answer. The function returns the length of the answer. The answer can be Ok, ERROR or expect. The command may be empty or NULL */

5 years, 2 months

git:5.2:df08856b: db_mysql: fixed typo in comments (timout -> timeout)

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: df08856b7570ee477e1aaa49d0550e8541f19f02 URL: https://github.com/kamailio/kamailio/commit/df08856b7570ee477e1aaa49d0550e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:41:03+02:00 db_mysql: fixed typo in comments (timout -> timeout) (cherry picked from commit 75e0e0f4d693e207d2035f84c3e1ddc9cc715ec4) --- Modified: src/modules/db_mysql/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/df08856b7570ee477e1aaa49d0550e8… Patch: https://github.com/kamailio/kamailio/commit/df08856b7570ee477e1aaa49d0550e8… --- diff --git a/src/modules/db_mysql/km_dbase.c b/src/modules/db_mysql/km_dbase.c index 581e4e14be..97b0e4904c 100644 --- a/src/modules/db_mysql/km_dbase.c +++ b/src/modules/db_mysql/km_dbase.c @@ -89,7 +89,7 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) } } /* - * We're doing later a query anyway that will reset the timout of the server, + * We're doing later a query anyway that will reset the timeout of the server, * so it makes sense to set the timestamp value to the actual time in order * to prevent unnecessary pings. */

5 years, 2 months

git:5.2:b5264c56: tm: removed async mutex define option

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: b5264c56d0fe55622e7f2451d5fbdec1eb05865f URL: https://github.com/kamailio/kamailio/commit/b5264c56d0fe55622e7f2451d5fbdec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-07T10:40:37+02:00 tm: removed async mutex define option - it was disbaled due to conflict with reply processing, the reply mutex being used, t_continue() has same processing like a failure handling (cherry picked from commit de11e2850314b12320cf8fed29f709a38a986709) --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/lock.c Modified: src/modules/tm/lock.h Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/b5264c56d0fe55622e7f2451d5fbdec… Patch: https://github.com/kamailio/kamailio/commit/b5264c56d0fe55622e7f2451d5fbdec… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index baebd82914..88cadb386f 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -407,7 +407,6 @@ struct cell *build_cell(struct sip_msg *p_msg) init_synonym_id(p_msg, new_cell->md5); init_cell_lock(new_cell); - init_async_lock(new_cell); t_stats_created(); return new_cell; diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 2a1e76160e..ba3c7b702e 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -446,11 +446,6 @@ typedef struct cell /* recursive reply lock count */ int reply_rec_lock_level; -#ifdef ENABLE_ASYNC_MUTEX - /* protect against concurrent async continues */ - ser_lock_t async_mutex; -#endif - ticks_t fr_timeout; /* final response interval for retr_bufs */ ticks_t fr_inv_timeout; /* final inv. response interval for retr_bufs */ #ifdef TM_DIFF_RT_TIMEOUT diff --git a/src/modules/tm/lock.c b/src/modules/tm/lock.c index eb2e1a5bf0..8ea3e844a4 100644 --- a/src/modules/tm/lock.c +++ b/src/modules/tm/lock.c @@ -53,9 +53,6 @@ static int sem_nr; gen_lock_set_t *entry_semaphore = 0; gen_lock_set_t *reply_semaphore = 0; -#ifdef ENABLE_ASYNC_MUTEX -gen_lock_set_t *async_semaphore = 0; -#endif #endif @@ -85,12 +82,6 @@ int lock_initialize() lock_set_destroy(reply_semaphore); lock_set_dealloc(reply_semaphore); } -#ifdef ENABLE_ASYNC_MUTEX - if(async_semaphore != 0) { - lock_set_destroy(async_semaphore); - lock_set_dealloc(async_semaphore); - } -#endif if(i == 0) { LOG(L_CRIT, "lock_initialize: could not allocate semaphore" " sets\n"); @@ -142,20 +133,6 @@ int lock_initialize() i--; goto again; } -#ifdef ENABLE_ASYNC_MUTEX - i++; - if(((async_semaphore = lock_set_alloc(i)) == 0) - || (lock_set_init(async_semaphore) == 0)) { - if(async_semaphore) { - lock_set_dealloc(async_semaphore); - async_semaphore = 0; - } - LM_DBG("async semaphore initialization failure: %s\n", strerror(errno)); - probe_run = 1; - i--; - goto again; - } -#endif /* return success */ LM_INFO("semaphore arrays of size %d allocated\n", sem_nr); @@ -195,13 +172,6 @@ void lock_cleanup() lock_set_destroy(reply_semaphore); lock_set_dealloc(reply_semaphore); }; -#ifdef ENABLE_ASYNC_MUTEX - if(async_semaphore != 0) { - lock_set_destroy(async_semaphore); - lock_set_dealloc(async_semaphore); - } - async_semaphore = 0; -#endif entry_semaphore = reply_semaphore = 0; } #endif /*GEN_LOCK_T_PREFERED*/ @@ -235,22 +205,6 @@ int init_entry_lock(struct s_table *ht, struct entry *entry) return 0; } -int init_async_lock(struct cell *cell) -{ -#ifdef ENABLE_ASYNC_MUTEX - -#ifdef GEN_LOCK_T_PREFERED - lock_init(&cell->async_mutex); -#else - cell->async_mutex.semaphore_set = async_semaphore; - cell->async_mutex.semaphore_index = cell->hash_index % sem_nr; -#endif /* GEN_LOCK_T_PREFERED */ - -#endif /* ENABLE_ASYNC_MUTEX */ - - return 0; -} - int release_cell_lock(struct cell *cell) { #ifndef GEN_LOCK_T_PREFERED diff --git a/src/modules/tm/lock.h b/src/modules/tm/lock.h index d2c17b712f..e115c03fe4 100644 --- a/src/modules/tm/lock.h +++ b/src/modules/tm/lock.h @@ -58,7 +58,6 @@ void lock_cleanup(void); int init_cell_lock(struct cell *cell); int init_entry_lock(struct s_table *ht, struct entry *entry); -int init_async_lock(struct cell *cell); int release_cell_lock(struct cell *cell); diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index c37957daba..c2c0773b3f 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -41,13 +41,8 @@ #include "../../core/data_lump_rpl.h" -#ifdef ENABLE_ASYNC_MUTEX -#define LOCK_ASYNC_CONTINUE(_t) lock(&(_t)->async_mutex ) -#define UNLOCK_ASYNC_CONTINUE(_t) unlock(&(_t)->async_mutex ) -#else #define LOCK_ASYNC_CONTINUE(_t) LOCK_REPLIES(_t) #define UNLOCK_ASYNC_CONTINUE(_t) UNLOCK_REPLIES(_t) -#endif /* Suspends the transaction for later use. * Save the returned hash_index and label to get

5 years, 2 months

← Newer
1
...
35
36
37
38
39
40
41
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2019