sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:5.0:6f9f851c: db_mysql: do not set reconnect field explicitely for newer mysql versions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 6f9f851cbd88a1bdd9e9dd2180b498e821a5686b URL: https://github.com/kamailio/kamailio/commit/6f9f851cbd88a1bdd9e9dd2180b498e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-03T08:29:39+01:00 db_mysql: do not set reconnect field explicitely for newer mysql versions - exposed with MariaDB 10.2 - include mysql.h instead of mysql_version.h - reported by GH #1296 (cherry picked from commit c31535072a04273b52a5cbc015e7ed1423d5dc33) --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/6f9f851cbd88a1bdd9e9dd2180b498e… Patch: https://github.com/kamailio/kamailio/commit/6f9f851cbd88a1bdd9e9dd2180b498e… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index b5f586dcf2..38e6875a19 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2001-2004 iptel.org * Copyright (C) 2008 1&1 Internet AG * @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -28,7 +28,7 @@ #include "km_my_con.h" #include "km_db_mysql.h" -#include <mysql_version.h> +#include <mysql.h> #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/ut.h" @@ -108,12 +108,17 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) rec = 1; mysql_options(ptr->con, MYSQL_OPT_RECONNECT, &rec); } +#else + if (db_mysql_auto_reconnect) + ptr->con->reconnect = 1; + else + ptr->con->reconnect = 0; #endif - if (db_mysql_update_affected_found) { + if (db_mysql_update_affected_found) { connection_flag |= CLIENT_FOUND_ROWS; } - + #if (MYSQL_VERSION_ID >= 40100) if (!mysql_real_connect(ptr->con, host, id->username, id->password, id->database, id->port, 0, connection_flag|CLIENT_MULTI_STATEMENTS)) { @@ -127,11 +132,6 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_close(ptr->con); goto err; } - /* force reconnection if enabled */ - if (db_mysql_auto_reconnect) - ptr->con->reconnect = 1; - else - ptr->con->reconnect = 0; LM_DBG("connection type is %s\n", mysql_get_host_info(ptr->con)); LM_DBG("protocol version is %d\n", mysql_get_proto_info(ptr->con));

7 years

git:master:95bd694e: evapi: dispatcher worker to send event data directly

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 95bd694e75c250d8b26cac071bff2e48e0eb9062 URL: https://github.com/kamailio/kamailio/commit/95bd694e75c250d8b26cac071bff2e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-03T08:26:36+01:00 evapi: dispatcher worker to send event data directly - instead of trying to send over internal socket, which is open only for reading in this process --- Modified: src/modules/evapi/evapi_dispatch.c Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/95bd694e75c250d8b26cac071bff2e4… Patch: https://github.com/kamailio/kamailio/commit/95bd694e75c250d8b26cac071bff2e4… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 2aaaf1e6c9..40ab0e5ed1 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -46,6 +46,7 @@ static int _evapi_notify_sockets[2]; static int _evapi_netstring_format = 1; extern str _evapi_event_callback; +extern int _evapi_dispatcher_pid; #define EVAPI_IPADDR_SIZE 64 #define EVAPI_TAG_SIZE 64 @@ -256,6 +257,7 @@ void evapi_close_notify_sockets_child(void) { LM_DBG("closing the notification socket used by children\n"); close(_evapi_notify_sockets[1]); + _evapi_notify_sockets[1] = -1; } /** @@ -265,6 +267,7 @@ void evapi_close_notify_sockets_parent(void) { LM_DBG("closing the notification socket used by parent\n"); close(_evapi_notify_sockets[0]); + _evapi_notify_sockets[0] = -1; } /** @@ -730,11 +733,21 @@ int _evapi_relay(str *evdata, str *ctag, int unicast) emsg->unicast = unicast; } - LM_DBG("sending [%p] [%.*s] (%d)\n", emsg, emsg->data.len, emsg->data.s, emsg->data.len); - len = write(_evapi_notify_sockets[1], &emsg, sizeof(evapi_msg_t*)); - if(len<=0) { - LM_ERR("failed to pass the pointer to evapi dispatcher\n"); - return -1; + LM_DBG("sending [%p] [%.*s] (%d)\n", emsg, emsg->data.len, emsg->data.s, + emsg->data.len); + if(_evapi_notify_sockets[1]!=-1) { + len = write(_evapi_notify_sockets[1], &emsg, sizeof(evapi_msg_t*)); + if(len<=0) { + shm_free(emsg); + LM_ERR("failed to pass the pointer to evapi dispatcher\n"); + return -1; + } + } else { + cfg_update(); + LM_DBG("dispatching [%p] [%.*s] (%d)\n", emsg, + emsg->data.len, emsg->data.s, emsg->data.len); + evapi_dispatch_notify(emsg); + shm_free(emsg); } return 0; } diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index 353027f4c6..e5eac596ae 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -52,9 +52,9 @@ static char *_evapi_bind_param = NULL; static int _evapi_netstring_format_param = 1; str _evapi_event_callback = STR_NULL; +int _evapi_dispatcher_pid = -1; static tm_api_t tmb; -static int _evapi_dispatcher_pid = -1; static int mod_init(void); static int child_init(int);

7 years

git:master:c3153507: db_mysql: do not set reconnect field explicitely for newer mysql versions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c31535072a04273b52a5cbc015e7ed1423d5dc33 URL: https://github.com/kamailio/kamailio/commit/c31535072a04273b52a5cbc015e7ed1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-03T08:23:29+01:00 db_mysql: do not set reconnect field explicitely for newer mysql versions - exposed with MariaDB 10.2 - include mysql.h instead of mysql_version.h - reported by GH #1296 --- Modified: src/modules/db_mysql/km_my_con.c --- Diff: https://github.com/kamailio/kamailio/commit/c31535072a04273b52a5cbc015e7ed1… Patch: https://github.com/kamailio/kamailio/commit/c31535072a04273b52a5cbc015e7ed1… --- diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c index b5f586dcf2..38e6875a19 100644 --- a/src/modules/db_mysql/km_my_con.c +++ b/src/modules/db_mysql/km_my_con.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2001-2004 iptel.org * Copyright (C) 2008 1&1 Internet AG * @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -28,7 +28,7 @@ #include "km_my_con.h" #include "km_db_mysql.h" -#include <mysql_version.h> +#include <mysql.h> #include "../../core/mem/mem.h" #include "../../core/dprint.h" #include "../../core/ut.h" @@ -108,12 +108,17 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) rec = 1; mysql_options(ptr->con, MYSQL_OPT_RECONNECT, &rec); } +#else + if (db_mysql_auto_reconnect) + ptr->con->reconnect = 1; + else + ptr->con->reconnect = 0; #endif - if (db_mysql_update_affected_found) { + if (db_mysql_update_affected_found) { connection_flag |= CLIENT_FOUND_ROWS; } - + #if (MYSQL_VERSION_ID >= 40100) if (!mysql_real_connect(ptr->con, host, id->username, id->password, id->database, id->port, 0, connection_flag|CLIENT_MULTI_STATEMENTS)) { @@ -127,11 +132,6 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) mysql_close(ptr->con); goto err; } - /* force reconnection if enabled */ - if (db_mysql_auto_reconnect) - ptr->con->reconnect = 1; - else - ptr->con->reconnect = 0; LM_DBG("connection type is %s\n", mysql_get_host_info(ptr->con)); LM_DBG("protocol version is %d\n", mysql_get_proto_info(ptr->con));

7 years

msilo Content-Type for picture and video?

by sscc

Hello kamailio folks i am successfully storing and dumping messages for off line users using msilo content type text/plain. i want to store off-line messages for pictures and videos. my particular queries are 1) is msilo store picture and videos? (i have observed blob in silo database table which is used for pictures. 2) in case it does what will be declared in content type hdr parameter? any help in this regard will highly be appreciated. regards, sscc -- Sent from: http://sip-router.1086192.n5.nabble.com/Development-f28106.html

7 years

git:master:b8a76ac1: Makefile.defs: version set to 5.1.0-pre0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b8a76ac176dfe2a10349b17072ed84e4b914bd8f URL: https://github.com/kamailio/kamailio/commit/b8a76ac176dfe2a10349b17072ed84e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-02T10:50:03+01:00 Makefile.defs: version set to 5.1.0-pre0 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b8a76ac176dfe2a10349b17072ed84e… Patch: https://github.com/kamailio/kamailio/commit/b8a76ac176dfe2a10349b17072ed84e… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index e6fb7858f6..9f7ef692da 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 1 SUBLEVEL = 0 -EXTRAVERSION = -dev8 +EXTRAVERSION = -pre0 # memory manager switcher # 0 - f_malloc (fast malloc)

7 years

git:master:3642f1f1: core: try to handle hep3 over tcp/tls from reader

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3642f1f1fa0a5c34ed2e61988b93e4ecb7d4596e URL: https://github.com/kamailio/kamailio/commit/3642f1f1fa0a5c34ed2e61988b93e4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-02T10:47:50+01:00 core: try to handle hep3 over tcp/tls from reader - avoid going through longer processing path - done only global parameter tcp_accept_hep3 is set --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/tcp_conn.h Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/3642f1f1fa0a5c34ed2e61988b93e4e… Patch: https://github.com/kamailio/kamailio/commit/3642f1f1fa0a5c34ed2e61988b93e4e…

7 years

[kamailio/kamailio] Memory leak fifo process (#1295)

by Jonathan Metivier

### Description We experience the same issue as http://lists.opensips.org/pipermail/users/2015-September/032520.html #### Log Messages ERROR: regex [regex_mod.c:289]: load_pcres(): no more memory for patterns[10] ERROR: regex [regex_mod.c:679]: mi_pcres_reload(): failed to reload pcres ### Possible Solutions See their solution : https://github.com/OpenSIPS/opensips/commit/aa7429e0124478f999ba3737b10ae39… ### Additional Information kamailio -v version: kamailio 4.2.0 (x86_64/linux) 36e695 flags: STATS: Off, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, F_MALLOC, DBG_F_MALLOC, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 36e695 compiled on 08:10:49 Sep 7 2016 with gcc 4.9.2 * **Operating System**: uname -a Linux abc 4.9.0-0.bpo.2-amd64 #1 SMP Debian 4.9.18-1~bpo8+1 (2017-04-10) x86_64 GNU/Linux -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1295

7 years

git:4.4:7a3f8995: regex: free unused tmp pkg memory for reloaded patterns

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 7a3f89954ef1d2daf49fb9a7b7e080c2edecc174 URL: https://github.com/kamailio/kamailio/commit/7a3f89954ef1d2daf49fb9a7b7e080c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-02T08:52:16+01:00 regex: free unused tmp pkg memory for reloaded patterns - use memset instead of for loop to init allocated memory to 0 - partial backport of 5f8dc56f3cb47d1e804fbc3d7f5321ce979d61d9 --- Modified: modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7a3f89954ef1d2daf49fb9a7b7e080c… Patch: https://github.com/kamailio/kamailio/commit/7a3f89954ef1d2daf49fb9a7b7e080c… --- diff --git a/modules/regex/regex_mod.c b/modules/regex/regex_mod.c index 71acfc955b..645ef29598 100644 --- a/modules/regex/regex_mod.c +++ b/modules/regex/regex_mod.c @@ -431,9 +431,7 @@ static int load_pcres(int action) LM_ERR("no more memory for pcres\n"); goto err; } - for (i=0; i<num_pcres_tmp; i++) { - pcres[i] = NULL; - } + memset(pcres, 0, sizeof(pcre *) * num_pcres_tmp); for (i=0; i<num_pcres_tmp; i++) { pcre_rc = pcre_fullinfo(pcres_tmp[i], NULL, PCRE_INFO_SIZE, &pcre_size); if ((pcres[i] = shm_malloc(pcre_size)) == 0) { @@ -450,6 +448,10 @@ static int load_pcres(int action) pkg_free(pcres_tmp[i]); } pkg_free(pcres_tmp); + /* Free allocated slots for unused patterns */ + for (i = num_pcres_tmp; i < max_groups; i++) { + pkg_free(patterns[i]); + } pkg_free(patterns); lock_release(reload_lock);

7 years

git:5.0:5f8dc56f: regex: free unused tmp pkg memory for reloaded patterns

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 5f8dc56f3cb47d1e804fbc3d7f5321ce979d61d9 URL: https://github.com/kamailio/kamailio/commit/5f8dc56f3cb47d1e804fbc3d7f5321c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-02T08:48:02+01:00 regex: free unused tmp pkg memory for reloaded patterns - use memset instead of for loop to init allocated memory to 0 - few bits of code formatting (cherry picked from commit 5940e759a754644d29e4145eea648ede45b4b356) --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5f8dc56f3cb47d1e804fbc3d7f5321c… Patch: https://github.com/kamailio/kamailio/commit/5f8dc56f3cb47d1e804fbc3d7f5321c… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index e0c8761a75..dc953661ce 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -270,17 +270,17 @@ static int load_pcres(int action) fclose(f); goto err; } - memset(patterns[i], '\0', group_max_size); + memset(patterns[i], 0, group_max_size); } /* Read the file and extract the patterns */ - memset(line, '\0', FILE_MAX_LINE); + memset(line, 0, FILE_MAX_LINE); i = -1; while (fgets(line, FILE_MAX_LINE, f) != NULL) { /* Ignore comments and lines starting by space, tab, CR, LF */ if(isspace(line[0]) || line[0]=='#') { - memset(line, '\0', FILE_MAX_LINE); + memset(line, 0, FILE_MAX_LINE); continue; } @@ -302,7 +302,7 @@ static int load_pcres(int action) } /* Start the regular expression with '(' */ patterns[i][0] = '('; - memset(line, '\0', FILE_MAX_LINE); + memset(line, 0, FILE_MAX_LINE); continue; } @@ -328,7 +328,7 @@ static int load_pcres(int action) /* Append the line to the current pattern */ memcpy(patterns[i]+strlen(patterns[i]), line, strlen(line)); - memset(line, '\0', FILE_MAX_LINE); + memset(line, 0, FILE_MAX_LINE); } num_pcres_tmp = i + 1; @@ -369,7 +369,8 @@ static int load_pcres(int action) /* Log the group patterns */ LM_INFO("num groups = %d\n", num_pcres_tmp); for (i=0; i < num_pcres_tmp; i++) { - LM_INFO("<group[%d]>%s</group[%d]> (size = %i)\n", i, patterns[i], i, (int)strlen(patterns[i])); + LM_INFO("<group[%d]>%s</group[%d]> (size = %i)\n", i, patterns[i], + i, (int)strlen(patterns[i])); } /* Temporal pointer of pcres */ @@ -384,14 +385,17 @@ static int load_pcres(int action) /* Compile the patters */ for (i=0; i<num_pcres_tmp; i++) { - pcre_tmp = pcre_compile(patterns[i], pcre_options, &pcre_error, &pcre_erroffset, NULL); + pcre_tmp = pcre_compile(patterns[i], pcre_options, &pcre_error, + &pcre_erroffset, NULL); if (pcre_tmp == NULL) { - LM_ERR("pcre_tmp compilation of '%s' failed at offset %d: %s\n", patterns[i], pcre_erroffset, pcre_error); + LM_ERR("pcre_tmp compilation of '%s' failed at offset %d: %s\n", + patterns[i], pcre_erroffset, pcre_error); goto err; } pcre_rc = pcre_fullinfo(pcre_tmp, NULL, PCRE_INFO_SIZE, &pcre_size); if (pcre_rc) { - printf("pcre_fullinfo on compiled pattern[%i] yielded error: %d\n", i, pcre_rc); + printf("pcre_fullinfo on compiled pattern[%i] yielded error: %d\n", + i, pcre_rc); goto err; } @@ -419,9 +423,7 @@ static int load_pcres(int action) LM_ERR("no more memory for pcres\n"); goto err; } - for (i=0; i<num_pcres_tmp; i++) { - pcres[i] = NULL; - } + memset(pcres, 0, sizeof(pcre *) * num_pcres_tmp); for (i=0; i<num_pcres_tmp; i++) { pcre_rc = pcre_fullinfo(pcres_tmp[i], NULL, PCRE_INFO_SIZE, &pcre_size); if ((pcres[i] = shm_malloc(pcre_size)) == 0) { @@ -438,6 +440,10 @@ static int load_pcres(int action) pkg_free(pcres_tmp[i]); } pkg_free(pcres_tmp); + /* Free allocated slots for unused patterns */ + for (i = num_pcres_tmp; i < max_groups; i++) { + pkg_free(patterns[i]); + } pkg_free(patterns); lock_release(reload_lock); @@ -692,4 +698,3 @@ static int regex_init_rpc(void) } return 0; } -

7 years

git:master:5940e759: regex: free unused tmp pkg memory for reloaded patterns

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5940e759a754644d29e4145eea648ede45b4b356 URL: https://github.com/kamailio/kamailio/commit/5940e759a754644d29e4145eea648ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-02T08:42:58+01:00 regex: free unused tmp pkg memory for reloaded patterns - use memset instead of for loop to init allocated memory to 0 - few bits of code formatting --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5940e759a754644d29e4145eea648ed… Patch: https://github.com/kamailio/kamailio/commit/5940e759a754644d29e4145eea648ed… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index b83af7a2c9..9d5cbf6cfd 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -271,17 +271,17 @@ static int load_pcres(int action) fclose(f); goto err; } - memset(patterns[i], '\0', group_max_size); + memset(patterns[i], 0, group_max_size); } /* Read the file and extract the patterns */ - memset(line, '\0', FILE_MAX_LINE); + memset(line, 0, FILE_MAX_LINE); i = -1; while (fgets(line, FILE_MAX_LINE, f) != NULL) { /* Ignore comments and lines starting by space, tab, CR, LF */ if(isspace(line[0]) || line[0]=='#') { - memset(line, '\0', FILE_MAX_LINE); + memset(line, 0, FILE_MAX_LINE); continue; } @@ -303,7 +303,7 @@ static int load_pcres(int action) } /* Start the regular expression with '(' */ patterns[i][0] = '('; - memset(line, '\0', FILE_MAX_LINE); + memset(line, 0, FILE_MAX_LINE); continue; } @@ -329,7 +329,7 @@ static int load_pcres(int action) /* Append the line to the current pattern */ memcpy(patterns[i]+strlen(patterns[i]), line, strlen(line)); - memset(line, '\0', FILE_MAX_LINE); + memset(line, 0, FILE_MAX_LINE); } num_pcres_tmp = i + 1; @@ -370,7 +370,8 @@ static int load_pcres(int action) /* Log the group patterns */ LM_INFO("num groups = %d\n", num_pcres_tmp); for (i=0; i < num_pcres_tmp; i++) { - LM_INFO("<group[%d]>%s</group[%d]> (size = %i)\n", i, patterns[i], i, (int)strlen(patterns[i])); + LM_INFO("<group[%d]>%s</group[%d]> (size = %i)\n", i, patterns[i], + i, (int)strlen(patterns[i])); } /* Temporal pointer of pcres */ @@ -385,14 +386,17 @@ static int load_pcres(int action) /* Compile the patters */ for (i=0; i<num_pcres_tmp; i++) { - pcre_tmp = pcre_compile(patterns[i], pcre_options, &pcre_error, &pcre_erroffset, NULL); + pcre_tmp = pcre_compile(patterns[i], pcre_options, &pcre_error, + &pcre_erroffset, NULL); if (pcre_tmp == NULL) { - LM_ERR("pcre_tmp compilation of '%s' failed at offset %d: %s\n", patterns[i], pcre_erroffset, pcre_error); + LM_ERR("pcre_tmp compilation of '%s' failed at offset %d: %s\n", + patterns[i], pcre_erroffset, pcre_error); goto err; } pcre_rc = pcre_fullinfo(pcre_tmp, NULL, PCRE_INFO_SIZE, &pcre_size); if (pcre_rc) { - printf("pcre_fullinfo on compiled pattern[%i] yielded error: %d\n", i, pcre_rc); + printf("pcre_fullinfo on compiled pattern[%i] yielded error: %d\n", + i, pcre_rc); goto err; } @@ -420,9 +424,7 @@ static int load_pcres(int action) LM_ERR("no more memory for pcres\n"); goto err; } - for (i=0; i<num_pcres_tmp; i++) { - pcres[i] = NULL; - } + memset(pcres, 0, sizeof(pcre *) * num_pcres_tmp); for (i=0; i<num_pcres_tmp; i++) { pcre_rc = pcre_fullinfo(pcres_tmp[i], NULL, PCRE_INFO_SIZE, &pcre_size); if ((pcres[i] = shm_malloc(pcre_size)) == 0) { @@ -439,6 +441,10 @@ static int load_pcres(int action) pkg_free(pcres_tmp[i]); } pkg_free(pcres_tmp); + /* Free allocated slots for unused patterns */ + for (i = num_pcres_tmp; i < max_groups; i++) { + pkg_free(patterns[i]); + } pkg_free(patterns); lock_release(reload_lock); @@ -734,4 +740,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_regex_exports); return 0; -} \ No newline at end of file +}

7 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017