sr-dev

sr-dev@lists.kamailio.org

4 participants
45459 discussions

git:master:6492a6f9: pike: use pkg_malloc/pkg_free instead of system malloc
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 6492a6f905075fa73d911c345fe784f2d3c085e5 URL: https://github.com/kamailio/kamailio/commit/6492a6f905075fa73d911c345fe784f… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:50:20Z pike: use pkg_malloc/pkg_free instead of system malloc --- Modified: src/modules/pike/pike_top.c --- Diff: https://github.com/kamailio/kamailio/commit/6492a6f905075fa73d911c345fe784f… Patch: https://github.com/kamailio/kamailio/commit/6492a6f905075fa73d911c345fe784f… --- diff --git a/src/modules/pike/pike_top.c b/src/modules/pike/pike_top.c index 6940e84ca6..c7894604b6 100644 --- a/src/modules/pike/pike_top.c +++ b/src/modules/pike/pike_top.c @@ -79,10 +79,10 @@ int pike_top_add_entry( unsigned char *ip_addr, int addr_len, unsigned int expires, pike_node_status_t status ) { struct TopListItem_t *new_item - = (struct TopListItem_t *)malloc(sizeof(struct TopListItem_t)); + = (struct TopListItem_t *)pkg_malloc(sizeof(struct TopListItem_t)); if(!new_item) { - SYS_MEM_ERROR; + PKG_MEM_ERROR; return -1; } print_addr(ip_addr, addr_len); @@ -119,7 +119,7 @@ void pike_top_list_clear() top_list_iter = top_list_root; while (top_list_iter) { ptr = top_list_iter->next; - free(top_list_iter); + pkg_free(top_list_iter); top_list_iter = ptr; } top_list_root = 0;

1 0

git:master:19c9d56f: auth_ephemeral: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 19c9d56f3f6a53433949d2dac5494ad7b3b393a0 URL: https://github.com/kamailio/kamailio/commit/19c9d56f3f6a53433949d2dac5494ad… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:14:24Z auth_ephemeral: convert to memory logging helper --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/19c9d56f3f6a53433949d2dac5494ad… Patch: https://github.com/kamailio/kamailio/commit/19c9d56f3f6a53433949d2dac5494ad… --- diff --git a/src/modules/auth_ephemeral/auth_ephemeral_mod.c b/src/modules/auth_ephemeral/auth_ephemeral_mod.c index 2a00c7879d9..717432caa89 100644 --- a/src/modules/auth_ephemeral/auth_ephemeral_mod.c +++ b/src/modules/auth_ephemeral/auth_ephemeral_mod.c @@ -223,7 +223,7 @@ static inline int add_secret(str _secret_key) secret_struct = (struct secret *) shm_malloc(sizeof(struct secret)); if (secret_struct == NULL) { - LM_ERR("unable to allocate shared memory\n"); + SHM_MEM_ERROR; return -1; } @@ -313,7 +313,7 @@ static int secret_param(modparam_t _type, void *_val) sval.s = (char *) shm_malloc(sizeof(char) * sval.len); if (sval.s == NULL) { - LM_ERR("unable to allocate shared memory\n"); + SHM_MEM_ERROR; return -1; } memcpy(sval.s, (char *) _val, sval.len); @@ -363,7 +363,7 @@ void autheph_rpc_add_secret(rpc_t* rpc, void* ctx) sval.s = shm_malloc(sizeof(char) * sval.len); if (sval.s == NULL) { - LM_ERR("Unable to allocate shared memory\n"); + SHM_MEM_ERROR; rpc->fault(ctx, 500, "Not enough memory"); return; }

1 0

git:master:3d60451b: db_cluster: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 3d60451ba47b14ce5e406a62b18547ad7d7d9165 URL: https://github.com/kamailio/kamailio/commit/3d60451ba47b14ce5e406a62b18547a… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:16:31Z db_cluster: convert to memory logging helper --- Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_data.c --- Diff: https://github.com/kamailio/kamailio/commit/3d60451ba47b14ce5e406a62b18547a… Patch: https://github.com/kamailio/kamailio/commit/3d60451ba47b14ce5e406a62b18547a… --- diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index d1906e0f9d7..59449548b43 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -433,7 +433,7 @@ db1_con_t* db_cluster_init(const str* _dburl) cls->ref++; h = (db1_con_t*)pkg_malloc(sizeof(db1_con_t)); if (h==NULL) { - LM_ERR("out of pkg memory\n"); + PKG_MEM_ERROR; return NULL; } memset(h, 0, sizeof(db1_con_t)); diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index 6ff994974e9..af2d9459735 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -111,7 +111,7 @@ int dbcl_init_con(str *name, str *url) sc = (dbcl_con_t*)pkg_malloc(sizeof(dbcl_con_t)); if(sc==NULL) { - LM_ERR("no pkg memory\n"); + PKG_MEM_ERROR; return -1; } memset(sc, 0, sizeof(dbcl_con_t)); @@ -121,7 +121,7 @@ int dbcl_init_con(str *name, str *url) sc->sinfo = (dbcl_shared_t*)shm_malloc(sizeof(dbcl_shared_t)); if(sc->sinfo==NULL) { - LM_ERR("no shm memory\n"); + SHM_MEM_ERROR; pkg_free(sc); return -1; } @@ -357,7 +357,7 @@ int dbcl_init_cls(str *name, str *cons) sc = (dbcl_cls_t*)pkg_malloc(sizeof(dbcl_cls_t)); if(sc==NULL) { - LM_ERR("no pkg memory\n"); + PKG_MEM_ERROR; return -1; } memset(sc, 0, sizeof(dbcl_cls_t));

1 0

git:master:ab17b681: pdb: convert to memory logging helper, properly free memory in error cases
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: ab17b6811c94730f6428c218c9587d6365c9faa5 URL: https://github.com/kamailio/kamailio/commit/ab17b6811c94730f6428c218c9587d6… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:29:53Z pdb: convert to memory logging helper, properly free memory in error cases --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/ab17b6811c94730f6428c218c9587d6… Patch: https://github.com/kamailio/kamailio/commit/ab17b6811c94730f6428c218c9587d6… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index c6656ee62b5..e818b06efb3 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -541,6 +541,7 @@ static int add_server(char *host, char *port) server->host = pkg_malloc(strlen(host)+1); if (server->host == NULL) { PKG_MEM_ERROR; + pkg_free(server); return -1; } strcpy(server->host, host); @@ -798,9 +799,14 @@ static int mod_init(void) return -1; } - global_id = (uint16_t*)shm_malloc(sizeof(uint16_t)); - - return 0; + global_id = (uint16_t*)shm_malloc(sizeof(uint16_t)); + if(!global_id) + { + SHM_MEM_ERROR; + shm_free(active); + return -1; + } + return 0; } static int child_init (int rank)

1 0

git:master:811ede41: acc_diameter: convert to memory logging helper
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 811ede41167455369518adadff338a2064645d55 URL: https://github.com/kamailio/kamailio/commit/811ede41167455369518adadff338a2… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T08:26:53Z acc_diameter: convert to memory logging helper --- Modified: src/modules/acc_diameter/diam_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/811ede41167455369518adadff338a2… Patch: https://github.com/kamailio/kamailio/commit/811ede41167455369518adadff338a2… --- diff --git a/src/modules/acc_diameter/diam_avp.c b/src/modules/acc_diameter/diam_avp.c index aeb363f6430..6df88397fe4 100644 --- a/src/modules/acc_diameter/diam_avp.c +++ b/src/modules/acc_diameter/diam_avp.c @@ -150,7 +150,7 @@ AAA_AVP* AAACreateAVP( return avp; error: - LM_ERR("no more free memory for a new AVP!\n"); + PKG_MEM_ERROR_FMT("for a new AVP!\n"); if(avp) ad_free(avp); return 0; }

1 0

git:master:bc47875c: auth_diameter: add missing allocation checks, convert to memory logging helper, clarify logging
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: bc47875c2da39e755009c81ba1f2b4e7267b905e URL: https://github.com/kamailio/kamailio/commit/bc47875c2da39e755009c81ba1f2b4e… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T09:11:41Z auth_diameter: add missing allocation checks, convert to memory logging helper, clarify logging --- Modified: src/modules/auth_diameter/auth_diameter.c Modified: src/modules/auth_diameter/authorize.c Modified: src/modules/auth_diameter/avp.c Modified: src/modules/auth_diameter/message.c Modified: src/modules/auth_diameter/tcp_comm.c Modified: src/modules/auth_diameter/user_in.c --- Diff: https://github.com/kamailio/kamailio/commit/bc47875c2da39e755009c81ba1f2b4e… Patch: https://github.com/kamailio/kamailio/commit/bc47875c2da39e755009c81ba1f2b4e…

1 0

git:master:0b9442b1: acc: convert to memory logging helper, properly free memory in case of errors
by Henning Westerholt 29 Mar '23

29 Mar '23

Module: kamailio Branch: master Commit: 0b9442b14adccdc7305ba222833a149e64488d66 URL: https://github.com/kamailio/kamailio/commit/0b9442b14adccdc7305ba222833a149… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-03-29T08:23:13Z acc: convert to memory logging helper, properly free memory in case of errors --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/0b9442b14adccdc7305ba222833a149… Patch: https://github.com/kamailio/kamailio/commit/0b9442b14adccdc7305ba222833a149… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index 6e9d8ed5a48..216ff7685fc 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -634,32 +634,37 @@ void acc_api_set_arrays(acc_info_t *inf) int acc_arrays_alloc(void) { if ((val_arr = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(str))) == NULL) { - LM_ERR("failed to alloc val_arr\n"); + PKG_MEM_ERROR_FMT("failed to alloc val_arr\n"); return -1; } if ((int_arr = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(int))) == NULL) { - LM_ERR("failed to alloc int_arr\n"); + PKG_MEM_ERROR_FMT("failed to alloc int_arr\n"); + acc_arrays_free(); return -1; } if ((type_arr = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(char))) == NULL) { - LM_ERR("failed to alloc type_arr\n"); + PKG_MEM_ERROR_FMT("failed to alloc type_arr\n"); + acc_arrays_free(); return -1; } if ((log_attrs = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(str))) == NULL) { - LM_ERR("failed to alloc log_attrs\n"); + PKG_MEM_ERROR_FMT("failed to alloc log_attrs\n"); + acc_arrays_free(); return -1; } if ((db_keys = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(db_key_t))) == NULL) { - LM_ERR("failed to alloc db_keys\n"); + PKG_MEM_ERROR_FMT("failed to alloc db_keys\n"); + acc_arrays_free(); return -1; } if ((db_vals = pkg_mallocxz((ACC_CORE_LEN + acc_extra_size + MAX_ACC_LEG + 3) * sizeof(db_val_t))) == NULL) { - LM_ERR("failed to alloc db_vals\n"); + PKG_MEM_ERROR_FMT("failed to alloc db_vals\n"); + acc_arrays_free(); return -1; } diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index d15340b3481..0afa7630352 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -1028,32 +1028,37 @@ void cdr_api_set_arrays(cdr_info_t *inf) int cdr_arrays_alloc(void) { if ((cdr_attrs = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(str))) == NULL) { - LM_ERR("failed to alloc cdr_attrs\n"); + PKG_MEM_ERROR_FMT("failed to alloc cdr_attrs\n"); return -1; } if ((cdr_value_array = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(str))) == NULL) { - LM_ERR("failed to alloc cdr_value_array\n"); + PKG_MEM_ERROR_FMT("failed to alloc cdr_value_array\n"); + cdr_arrays_free(); return -1; } if ((cdr_int_array = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(int))) == NULL) { - LM_ERR("failed to alloc cdr_int_array\n"); + PKG_MEM_ERROR_FMT("failed to alloc cdr_int_array\n"); + cdr_arrays_free(); return -1; } if ((cdr_type_array = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(char))) == NULL) { - LM_ERR("failed to alloc cdr_type_array\n"); + PKG_MEM_ERROR_FMT("failed to alloc cdr_type_array\n"); + cdr_arrays_free(); return -1; } if ((db_cdr_keys = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(db_key_t))) == NULL) { - LM_ERR("failed to alloc db_cdr_keys\n"); + PKG_MEM_ERROR_FMT("failed to alloc db_cdr_keys\n"); + cdr_arrays_free(); return -1; } if ((db_cdr_vals = pkg_malloc((MAX_CDR_CORE + cdr_extra_size) * sizeof(db_val_t))) == NULL) { - LM_ERR("failed to alloc db_cdr_vals\n"); + PKG_MEM_ERROR_FMT("failed to alloc db_cdr_vals\n"); + cdr_arrays_free(); return -1; } diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index 6205ba1a17d..dc0e1259990 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -386,7 +386,7 @@ int acc_extra_arrays_alloc(void) { } if ((int_buf = pkg_malloc((INT2STR_MAX_LEN * acc_int_buf_size) * sizeof(char))) == NULL) { - LM_ERR("failed to alloc int_buf\n"); + PKG_MEM_ERROR_FMT("failed to alloc int_buf\n"); return -1; }

1 0

OpenSSL 1.1 end of life
by Olle E. Johansson 29 Mar '23

29 Mar '23

https://www.openssl.org/blog/blog/2023/03/28/1.1.1-EOL/ Are we ready for OpenSSL 3 in production? /O

2 1

Changing location id from INT(10) to BIGINT
by Julius Flohr 29 Mar '23

29 Mar '23

Hi, we've been using kamailio successfully for many years now and we've noticed that the id field in the location database of our installation (userloc module) will overflow in the foreseeable future. Currently it is setup as a INT(10). Are there any reasons not to change it to BIGINT and upstream that change? Cheers Julius

2 2

git:master:ba365102: evapi: initialize internal message queue
by Daniel-Constantin Mierla 28 Mar '23

28 Mar '23

Module: kamailio Branch: master Commit: ba365102fe9faa403717eb30f36d363bad13114b URL: https://github.com/kamailio/kamailio/commit/ba365102fe9faa403717eb30f36d363… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-03-28T17:31:31+02:00 evapi: initialize internal message queue --- Modified: src/modules/evapi/evapi_dispatch.h Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ba365102fe9faa403717eb30f36d363… Patch: https://github.com/kamailio/kamailio/commit/ba365102fe9faa403717eb30f36d363… --- diff --git a/src/modules/evapi/evapi_dispatch.h b/src/modules/evapi/evapi_dispatch.h index 23b4c2565c..c96bcbf275 100644 --- a/src/modules/evapi/evapi_dispatch.h +++ b/src/modules/evapi/evapi_dispatch.h @@ -53,4 +53,6 @@ int pv_set_evapi(sip_msg_t *msg, pv_param_t *param, int op, int evapi_cfg_close(sip_msg_t *msg); int evapi_set_tag(sip_msg_t* msg, str* stag); +int evapi_queue_init(void); + #endif diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index 27b3582698..708159ba3a 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -163,6 +163,10 @@ static int mod_init(void) _evapi_bind_addr = _evapi_bind_param; } + if(evapi_queue_init() < 0) { + LM_ERR("failed to init faked internal message queue\n"); + return -1; + } /* add space for one extra process */ register_procs(1 + _evapi_workers);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev