sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
324 discussions

git:master:cad3ae51: tls: updates to used log macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cad3ae51f25aedb5632d1ee7107dd11997a559c7 URL: https://github.com/kamailio/kamailio/commit/cad3ae51f25aedb5632d1ee7107dd11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:16:55+01:00 tls: updates to used log macros --- Modified: src/modules/tls/tls_bio.c Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/cad3ae51f25aedb5632d1ee7107dd11… Patch: https://github.com/kamailio/kamailio/commit/cad3ae51f25aedb5632d1ee7107dd11… --- diff --git a/src/modules/tls/tls_bio.c b/src/modules/tls/tls_bio.c index beb177399d..8fbb53a3b3 100644 --- a/src/modules/tls/tls_bio.c +++ b/src/modules/tls/tls_bio.c @@ -39,11 +39,11 @@ #ifdef TLS_BIO_DEBUG #ifdef __SUNPRO_C #define TLS_BIO_DBG(...) \ - LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + LOG_FP(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ "tls_BIO: " LOC_INFO, __VA_ARGS__) #else #define TLS_BIO_DBG(args...) \ - LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + LOG_FP(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ "tls_BIO: " LOC_INFO, ## args) #endif /* __SUNPRO_c */ #else /* TLS_BIO_DEBUG */ diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 5d3bc94522..9ce1b5e2f3 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -90,12 +90,12 @@ int tls_run_event_routes(struct tcp_connection *c); #ifdef TLS_F_DEBUG #ifdef __SUNPRO_C #define TLS_F_TRACE(fmt, ...) \ - LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + LOG_FP(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ "TLS_TRACE: " LOC_INFO, " %s" fmt,\ _FUNC_NAME_, __VA_ARGS__) #else #define TLS_F_TRACE(fmt, args...) \ - LOG_(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ + LOG_FP(DEFAULT_FACILITY, cfg_get(tls, tls_cfg, debug),\ "TLS_TRACE: " LOC_INFO, " %s" fmt,\ _FUNC_NAME_, ## args) #endif /* __SUNPRO_c */

4 years, 8 months

git:master:528eb33b: debugger: updates to used log macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 528eb33bd569db6258e351a295a7a0a459fa7a43 URL: https://github.com/kamailio/kamailio/commit/528eb33bd569db6258e351a295a7a0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:16:55+01:00 debugger: updates to used log macros --- Modified: src/modules/debugger/debugger_api.c --- Diff: https://github.com/kamailio/kamailio/commit/528eb33bd569db6258e351a295a7a0a… Patch: https://github.com/kamailio/kamailio/commit/528eb33bd569db6258e351a295a7a0a… --- diff --git a/src/modules/debugger/debugger_api.c b/src/modules/debugger/debugger_api.c index eb34abfd0c..e9dd4c8fd7 100644 --- a/src/modules/debugger/debugger_api.c +++ b/src/modules/debugger/debugger_api.c @@ -359,7 +359,7 @@ int dbg_cfg_trace(sr_event_param_t *evp) { if(is_printable(_dbg_cfgtrace_level)) { - LOG__(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, + LOG_FL(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, _dbg_cfgtrace_lname, _dbg_cfgtrace_prefix, "%s=[%s] c=[%s] l=%d a=%d n=%.*s\n", get_current_route_type_name(), ZSW(a->rname),

4 years, 8 months

git:master:6e6c9160: core: mem/tlsf_malloc - updates to used log macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6e6c91601e3a9a6cb797fe87a1d4c6430331db38 URL: https://github.com/kamailio/kamailio/commit/6e6c91601e3a9a6cb797fe87a1d4c64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:15:25+01:00 core: mem/tlsf_malloc - updates to used log macros --- Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6c91601e3a9a6cb797fe87a1d4c64… Patch: https://github.com/kamailio/kamailio/commit/6e6c91601e3a9a6cb797fe87a1d4c64… --- diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index 4907142e9b..33bbf4869d 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -1201,22 +1201,22 @@ void tlsf_status(tlsf_t pool) block_header_t* pb; memlog=cfg_get(core, core_cfg, memlog); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", "status of pool (%p):\n", pool); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", "heap size= %zu\n", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "status of pool (%p):\n", pool); + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "heap size= %zu\n", control->total_size); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "used= %zu, used+overhead=%zu, free=%zu, fragments=%zu\n", control->allocated, control->real_used, control->total_size - control->real_used, control->fragments); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "max used (+overhead)=%zu, max fragments=%zu\n", control->max_used, control->max_fragments); /* print a summary of the 2 levels bucket list */ - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "Free blocks matrix ('.': none, 'X': between 2^X and (2^(X+1)-1) free blocks, X=A..Z, A=0, B=1, ...)\n"); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "> first-level: %d block list arrays between 2^fl and 2^(fl+1) bytes (fl=%d..%d)\n", FL_INDEX_COUNT, FL_INDEX_SHIFT, FL_INDEX_MAX); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "v second-level: %d block lists between 2^fl+sl*2^(fl-%d) and 2^fl+(sl+1)*2^(fl-%d)-1 bytes (sl=0..%d)\n", SL_INDEX_COUNT, SL_INDEX_COUNT_LOG2, SL_INDEX_COUNT_LOG2, SL_INDEX_COUNT-1); for (sl = 0 ; sl < SL_INDEX_COUNT ; sl++) { @@ -1234,7 +1234,7 @@ void tlsf_status(tlsf_t pool) summary[fl] = 'A' + tlsf_fls(len); } } - LOG_(DEFAULT_FACILITY, memlog, "tlsf_status: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_status: ", "%2d|%.*s|\n", sl, FL_INDEX_COUNT, summary); } } @@ -1270,7 +1270,7 @@ void tlsf_sums(tlsf_t pool) memlog=cfg_get(core, core_cfg, memlog); - LOG_(DEFAULT_FACILITY, memlog, "tlsf_sums: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_sums: ", "pool (%p) summarizing all alloc'ed. fragments:\n", pool); @@ -1287,7 +1287,7 @@ void tlsf_sums(tlsf_t pool) x = root; while(x){ - LOG_(DEFAULT_FACILITY, memlog, "tlsf_sums: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_sums: ", " count=%6d size=%10lu bytes from %s: %s(%ld)\n", x->count,x->size, x->file, x->func, x->line @@ -1296,7 +1296,7 @@ void tlsf_sums(tlsf_t pool) free(x); x = root; } - LOG_(DEFAULT_FACILITY, memlog, "tlsf_sums: ", + LOG_FP(DEFAULT_FACILITY, memlog, "tlsf_sums: ", "-----------------------------\n"); }

4 years, 8 months

git:master:3ea30335: core: mem/q_malloc - updates to used log macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3ea303350eebf32232421c9888266286d9a3e86d URL: https://github.com/kamailio/kamailio/commit/3ea303350eebf32232421c988826628… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:15:10+01:00 core: mem/q_malloc - updates to used log macros --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/3ea303350eebf32232421c988826628… Patch: https://github.com/kamailio/kamailio/commit/3ea303350eebf32232421c988826628…

4 years, 8 months

git:master:950c3ba3: core: mem/f_malloc - updates to used log macros

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 950c3ba398d75b1606995a60b6128f1efa788bb2 URL: https://github.com/kamailio/kamailio/commit/950c3ba398d75b1606995a60b6128f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:14:26+01:00 core: mem/f_malloc - updates to used log macros --- Modified: src/core/mem/f_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/950c3ba398d75b1606995a60b6128f1… Patch: https://github.com/kamailio/kamailio/commit/950c3ba398d75b1606995a60b6128f1…

4 years, 8 months

git:master:c1ea3634: core: action - update used log macro for core log() function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c1ea36344448efe8a06c0c74fad73db07c9174ed URL: https://github.com/kamailio/kamailio/commit/c1ea36344448efe8a06c0c74fad73db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:11:10+01:00 core: action - update used log macro for core log() function --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/c1ea36344448efe8a06c0c74fad73db… Patch: https://github.com/kamailio/kamailio/commit/c1ea36344448efe8a06c0c74fad73db… --- diff --git a/src/core/action.c b/src/core/action.c index 8211cf00f7..633a38da16 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -506,7 +506,7 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) ret=E_BUG; goto error; } - LOG_(DEFAULT_FACILITY, a->val[0].u.number, "<script>: ", "%s", + LOG_FN(DEFAULT_FACILITY, a->val[0].u.number, "<script>: ", "%s", a->val[1].u.string); ret=1; break;

4 years, 8 months

git:master:a7f86225: core: dprint - log macro to print message without function name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a7f862259f83af5d9296202a26b3bf80125d1397 URL: https://github.com/kamailio/kamailio/commit/a7f862259f83af5d9296202a26b3bf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-15T16:08:02+01:00 core: dprint - log macro to print message without function name - LOG_FN(...) skips printing the function name, to have a variant used in a few places (xlog, xpring) and be same output format like previous releases - renamed log macros ending in underscores to be easier to follow the code and search for places of usage --- Modified: src/core/dprint.h --- Diff: https://github.com/kamailio/kamailio/commit/a7f862259f83af5d9296202a26b3bf8… Patch: https://github.com/kamailio/kamailio/commit/a7f862259f83af5d9296202a26b3bf8…

4 years, 8 months

git:master:e1f1b3a5: tmx: convert to memory logging helper

by Henning Westerholt

Module: kamailio Branch: master Commit: e1f1b3a5e55e05a80af4e2ef91fac42892211c08 URL: https://github.com/kamailio/kamailio/commit/e1f1b3a5e55e05a80af4e2ef91fac42… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 tmx: convert to memory logging helper --- Modified: src/modules/tmx/t_var.c Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/e1f1b3a5e55e05a80af4e2ef91fac42… Patch: https://github.com/kamailio/kamailio/commit/e1f1b3a5e55e05a80af4e2ef91fac42… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 1f83eca50d..15938fcd9e 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -117,7 +117,7 @@ int pv_t_update_req(struct sip_msg *msg) _pv_treq.buf = (char*)pkg_malloc(_pv_treq.buf_size*sizeof(char)); if(_pv_treq.buf==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; _pv_treq.buf_size = 0; return -1; } @@ -195,7 +195,7 @@ int pv_t_update_rpl(struct sip_msg *msg) _pv_trpl.buf = (char*)pkg_malloc(_pv_trpl.buf_size*sizeof(char)); if(_pv_trpl.buf==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; _pv_trpl.buf_size = 0; return -1; } @@ -263,7 +263,7 @@ int pv_t_update_inv(struct sip_msg *msg) _pv_tinv.buf = (char*)pkg_malloc(_pv_tinv.buf_size*sizeof(char)); if(_pv_tinv.buf==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; _pv_tinv.buf_size = 0; goto error; } @@ -368,8 +368,10 @@ int pv_parse_t_var_name(pv_spec_p sp, str *in) return -1; pv = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t)); - if(pv==NULL) + if(pv==NULL) { + PKG_MEM_ERROR; return -1; + } memset(pv, 0, sizeof(pv_spec_t)); diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 67c4f7f4af..256c82bf16 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -89,7 +89,7 @@ int tmx_init_pretran_table(void) _tmx_ptran_table = (pretran_slot_t*)shm_malloc(_tmx_ptran_size*sizeof(pretran_slot_t)); if(_tmx_ptran_table == NULL) { - LM_ERR("not enough shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(_tmx_ptran_table, 0, _tmx_ptran_size*sizeof(pretran_slot_t)); @@ -249,7 +249,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(unlikely(_tmx_proc_ptran == NULL)) { _tmx_proc_ptran = (pretran_t*)shm_malloc(sizeof(pretran_t)); if(_tmx_proc_ptran == NULL) { - LM_ERR("not enough memory for pretran structure\n"); + SHM_MEM_ERROR_FMT("pretran structure\n"); return -1; } memset(_tmx_proc_ptran, 0, sizeof(pretran_t)); @@ -270,7 +270,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(_tmx_proc_ptran->dbuf.s) shm_free(_tmx_proc_ptran->dbuf.s); _tmx_proc_ptran->dbuf.s = (char*)shm_malloc(dsize); if(_tmx_proc_ptran->dbuf.s==NULL) { - LM_ERR("not enough memory for pretran data\n"); + SHM_MEM_ERROR_FMT("pretran data\n"); return -1; } _tmx_proc_ptran->dbuf.len = dsize;

4 years, 8 months

git:master:32c917f6: topoh: convert to memory logging helper

by Henning Westerholt

Module: kamailio Branch: master Commit: 32c917f6a9a1bf4f5b95d3bdcbc5f3efdd209948 URL: https://github.com/kamailio/kamailio/commit/32c917f6a9a1bf4f5b95d3bdcbc5f3e… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 topoh: convert to memory logging helper --- Modified: src/modules/topoh/th_mask.c Modified: src/modules/topoh/th_msg.c Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/32c917f6a9a1bf4f5b95d3bdcbc5f3e… Patch: https://github.com/kamailio/kamailio/commit/32c917f6a9a1bf4f5b95d3bdcbc5f3e… --- diff --git a/src/modules/topoh/th_mask.c b/src/modules/topoh/th_mask.c index cc2ae7e5a9..122d0935a5 100644 --- a/src/modules/topoh/th_mask.c +++ b/src/modules/topoh/th_mask.c @@ -98,7 +98,7 @@ char* th_mask_encode(char *in, int ilen, str *prefix, int *olen) out = (char*)pkg_malloc((*olen+1)*sizeof(char)); if(out==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; *olen = 0; return NULL; } @@ -151,7 +151,7 @@ char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen) if(out==NULL) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; *olen = 0; return NULL; } diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 6849520540..990128c01e 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -294,7 +294,7 @@ int th_mask_contact(sip_msg_t *msg) p = (char*)pkg_malloc(out.len+3); if(p==NULL) { - LM_ERR("failed to get more pkg\n"); + PKG_MEM_ERROR; pkg_free(out.s); return -1; } @@ -441,7 +441,7 @@ int th_unmask_via(sip_msg_t *msg, str *cookie) via2=pkg_malloc(sizeof(struct via_body)); if (via2==0) { - LM_ERR("out of memory\n"); + PKG_MEM_ERROR; pkg_free(out.s); return -1; @@ -983,7 +983,7 @@ int th_add_via_cookie(sip_msg_t *msg, struct via_body *via) out.s = (char*)pkg_malloc(out.len+1); if(out.s==0) { - LM_ERR("no pkg memory\n"); + PKG_MEM_ERROR; return -1; } out.s[0] = ';'; @@ -1009,7 +1009,7 @@ int th_add_hdr_cookie(sip_msg_t *msg) h.s = (char*)pkg_malloc(h.len+1); if(h.s == 0) { - LM_ERR("no more pkg\n"); + PKG_MEM_ERROR; return -1; } anchor = anchor_lump(msg, msg->unparsed - msg->buf, 0, 0); diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 0eb5345598..fb5d045910 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -186,7 +186,7 @@ static int mod_init(void) th_via_prefix.s = (char*)pkg_malloc(th_via_prefix.len+1); if(th_via_prefix.s==NULL) { - LM_ERR("via prefix parameter is invalid\n"); + PKG_MEM_ERROR_FMT("via prefix parameter\n"); goto error; } /* 'sip:' + ip + ';' + param + '=' + prefix (+ '\0') */ @@ -195,7 +195,7 @@ static int mod_init(void) th_uri_prefix.s = (char*)pkg_malloc(th_uri_prefix.len+1); if(th_uri_prefix.s==NULL) { - LM_ERR("uri prefix parameter is invalid\n"); + PKG_MEM_ERROR_FMT("uri prefix parameter\n"); goto error; } /* build via prefix */

4 years, 8 months

git:master:b06268f0: topos: convert to memory logging helper

by Henning Westerholt

Module: kamailio Branch: master Commit: b06268f071ac614f914669a0888c59b8b4255ed2 URL: https://github.com/kamailio/kamailio/commit/b06268f071ac614f914669a0888c59b… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-13T23:08:35+01:00 topos: convert to memory logging helper --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/b06268f071ac614f914669a0888c59b… Patch: https://github.com/kamailio/kamailio/commit/b06268f071ac614f914669a0888c59b… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 3bb5f12f46..e40a51003e 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -163,8 +163,7 @@ int tps_add_headers(sip_msg_t *msg, str *hname, str *hbody, int hpos) hs.len = hname->len + 2 + hbody->len; hs.s = (char*)pkg_malloc(hs.len + 3); if (hs.s==NULL) { - LM_ERR("no pkg memory left (%.*s - %d)\n", - hname->len, hname->s, hs.len); + PKG_MEM_ERROR_FMT("(%.*s - %d)\n", hname->len, hname->s, hs.len); return -1; } memcpy(hs.s, hname->s, hname->len);

4 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2020