sr-dev August 2023

sr-dev@lists.kamailio.org

15 participants
211 discussions

git:master:c11fcbbe: msilo: cast to fix storage size warning
by Daniel-Constantin Mierla 23 Aug '23

23 Aug '23

Module: kamailio Branch: master Commit: c11fcbbe9ed19bc54b800100d15d9ae269735f0c URL: https://github.com/kamailio/kamailio/commit/c11fcbbe9ed19bc54b800100d15d9ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T13:03:02+02:00 msilo: cast to fix storage size warning --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/c11fcbbe9ed19bc54b800100d15d9ae… Patch: https://github.com/kamailio/kamailio/commit/c11fcbbe9ed19bc54b800100d15d9ae… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index a5d3b74c0c1..00cf593811f 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -741,7 +741,7 @@ static int m_store_addrs(sip_msg_t *msg, str *owner, str *srcaddr, str *dstaddr) } /* current time */ - val = (int)time(NULL); + val = (int)(unsigned long long)time(NULL); /* add expiration time */ db_keys[nr_keys] = &sc_exp_time;

1 0

git:master:5633026f: pv_headers: compare result of pvh_set_xavi() with NULL for error cases
by Daniel-Constantin Mierla 23 Aug '23

23 Aug '23

Module: kamailio Branch: master Commit: 5633026f90e46f7d6da8c1a658d425e8926f6949 URL: https://github.com/kamailio/kamailio/commit/5633026f90e46f7d6da8c1a658d425e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T10:55:35+02:00 pv_headers: compare result of pvh_set_xavi() with NULL for error cases - the function returns a pointer --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/5633026f90e46f7d6da8c1a658d425e… Patch: https://github.com/kamailio/kamailio/commit/5633026f90e46f7d6da8c1a658d425e… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index b772262691d..441a2a664af 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -619,11 +619,11 @@ int pvh_set_header( xavi->name.len, xavi->name.s, hname->len, hname->s); } if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) - < 0) + == NULL) goto err; } else { if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, idx, 0) - < 0) + == NULL) goto err; } } else if(val->flags & (PV_VAL_STR | PV_TYPE_INT | PV_VAL_INT)) { @@ -642,7 +642,7 @@ int pvh_set_header( } if(idx == 0 && idxf == PV_IDX_NONE) { if(pvh_set_xavi(msg, &xavi_name, hname, &fval, SR_XTYPE_STR, 0, 1) - < 0) + == NULL) goto err; } else if(idxf == PV_IDX_ALL) { if(hname_cnt > 1) { @@ -652,11 +652,11 @@ int pvh_set_header( } if(pvh_set_xavi(msg, &xavi_name, hname, &fval, SR_XTYPE_STR, 0, hname_cnt ? 0 : 1) - < 0) + == NULL) goto err; } else { if(pvh_set_xavi(msg, &xavi_name, hname, &fval, SR_XTYPE_STR, idx, 0) - < 0) + == NULL) goto err; } if(pv_format) @@ -694,7 +694,7 @@ xavp_c_data_t *pvh_set_parsed( if(pvh_merge_uri(msg, SET_URI_T, cur, val, c_data) < 0) goto err; if(pvh_set_xavi(msg, &xavi_parsed_xname, hname, c_data, SR_XTYPE_DATA, 0, 0) - < 0) + == NULL) goto err; LM_DBG("c_data from pvh_merge_uri hname:%.*s\n", hname->len, hname->s); @@ -857,12 +857,12 @@ int pvh_set_uri(struct sip_msg *msg, pv_param_t *param, int op, pv_value_t *val) /* LM_DBG("xavi:%.*s hname:%.*s value:%.*s\n", xavi_name.len, xavi_name.s, hname.len, hname.s, c_data->value.len, c_data->value.s); */ if(pvh_set_xavi(msg, &xavi_name, &hname, &c_data->value, SR_XTYPE_STR, 0, 0) - < 0) + == NULL) goto err; if(pvh_set_xavi( msg, &xavi_parsed_xname, &hname, c_data, SR_XTYPE_DATA, 0, 0) - < 0) + == NULL) goto err; if(pv_format) @@ -1127,7 +1127,7 @@ int pvh_set_reply_sr( case 2: // reason if(pvh_set_xavi(msg, &xavi_name, &_hdr_reply_reason, &fval, SR_XTYPE_STR, 0, 0) - < 0) { + == NULL) { LM_ERR("set reply: cannot set reply reason\n"); goto err; }

1 0

git:master:027c2b30: db_redis: free db_keys in case of failure
by Daniel-Constantin Mierla 23 Aug '23

23 Aug '23

Module: kamailio Branch: master Commit: 027c2b30b39a7596c8630c06995ddc49bb42d789 URL: https://github.com/kamailio/kamailio/commit/027c2b30b39a7596c8630c06995ddc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T10:54:52+02:00 db_redis: free db_keys in case of failure --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/027c2b30b39a7596c8630c06995ddc4… Patch: https://github.com/kamailio/kamailio/commit/027c2b30b39a7596c8630c06995ddc4… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index c53a1593aa6..ff41aa45282 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -2584,6 +2584,8 @@ static int db_redis_perform_update(const db1_con_t *_h, km_redis_con_t *con, LM_ERR("failed to perform the update\n"); if(reply) db_redis_free_reply(&reply); + if(db_keys) + pkg_free(db_keys); db_redis_key_free(&query_v); db_redis_key_free(&all_type_keys); db_redis_key_free(&type_keys);

1 0

git:master:81c1ede6: core: allow space for ending string when creating socket structure at startup
by Daniel-Constantin Mierla 23 Aug '23

23 Aug '23

Module: kamailio Branch: master Commit: 81c1ede698f8dd6f2147c71ee6f3bb49ed4a682c URL: https://github.com/kamailio/kamailio/commit/81c1ede698f8dd6f2147c71ee6f3bb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-23T10:54:02+02:00 core: allow space for ending string when creating socket structure at startup --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/81c1ede698f8dd6f2147c71ee6f3bb4… Patch: https://github.com/kamailio/kamailio/commit/81c1ede698f8dd6f2147c71ee6f3bb4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 04a2e609323..6786ecaf6cc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -329,7 +329,7 @@ static inline struct socket_info *new_sock_info(char *name, } if(usename != NULL) { si->useinfo.name.len = strlen(usename); - si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len); + si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len + 1); if(si->useinfo.name.s == 0) goto error; strncpy(si->useinfo.name.s, usename, si->useinfo.name.len + 1);

1 0

[kamailio/kamailio] Module db_postgresql not found (Issue #3196)
by MenschLink 23 Aug '23

23 Aug '23

### Description I loaded module "db_postgres.so". I expected kamilio to start. It didn't ### Troubleshooting #### Reproduction  #### config file ``` #!KAMAILIO #!define WITH_POSTGRESSQL #!define WITH_AUTH #!define WITH_USRLOCDB #!define WITH_PRESENCE #!define WITH_MSGREBUILD #!define WITH_NAT #!define WITH_NATSIPPING .. . .. #!ifdef WITH_POSTGRESSQL loadmodule "db_postgres.so" #!endif ``` #### Log Messages  ``` Jul 22 10:31:16 opensips /usr/sbin/kamailio[8975]: ERROR: <core> [db.c:204]: db_bind_mod(): Module db_postgresql not found. Missing loadmodule? Jul 22 10:31:16 opensips /usr/sbin/kamailio[8975]: ERROR: usrloc [usrloc_mod.c:361]: mod_init(): failed to bind database module Jul 22 10:31:16 opensips /usr/sbin/kamailio[8975]: ERROR: <core> [core/sr_module.c:942]: init_mod(): Error while initializing module usrloc (/usr/lib/x86_64-linux-gnu/kamailio/modules/usrloc.so) ``` output from ls of modules directory: ``` acc.so call_obj.so dialog.so ipops.so msrp.so presence_conference.so qos.so sipcapture.so statsd.so uid_avp_db.so acc_diameter.so carrierroute.so dialplan.so jsonrpcs.so mtree.so presence_dialoginfo.so ratelimit.so sipdump.so stun.so uid_domain.so alias_db.so cfg_db.so dispatcher.so keepalive.so nat_traversal.so presence_mwi.so regex.so sipjson.so tcpops.so uid_gflags.so app_jsdt.so cfg_rpc.so diversion.so kemix.so nathelper.so presence_profile.so registrar.so sipt.so textops.so uid_uri_db.so app_sqlang.so cfgt.so dmq.so kex.so nosip.so presence_reginfo.so rls.so siptrace.so textopsx.so uri_db.so async.so cfgutils.so dmq_usrloc.so lcr.so outbound.so presence_xml.so rr.so siputils.so timer.so userblocklist.so auth.so corex.so domain.so log_custom.so p_usrloc.so pua.so rtimer.so sl.so tm.so usrloc.so auth_db.so counters.so domainpolicy.so lrkproxy.so path.so pua_bla.so rtjson.so sms.so tmrec.so xcap_client.so auth_diameter.so ctl.so drouting.so mangler.so pdb.so pua_dialoginfo.so rtpengine.so smsops.so tmx.so xcap_server.so auth_xkeys.so db2_ops.so enum.so matrix.so pdt.so pua_reginfo.so rtpproxy.so speeddial.so topoh.so xhttp.so avp.so db_cluster.so evrexec.so maxfwd.so permissions.so pua_rpc.so sanity.so sqlops.so topos.so xhttp_prom.so avpops.so db_flatstore.so exec.so mediaproxy.so pike.so pua_usrloc.so sca.so ss7ops.so tsilo.so xhttp_rpc.so benchmark.so db_postgres.so group.so mohqueue.so pipelimit.so pua_xmpp.so sdpops.so sst.so uac.so xlog.so blst.so db_text.so htable.so mqueue.so prefix_route.so pv.so seas.so statistics.so uac_redirect.so xprint.so call_control.so debugger.so imc.so msilo.so presence.so pv_headers.so secfilter.so statsc.so uid_auth_db.so ``` ### Possible Solutions  tried renaming db_postgres.so to db_postgresql.so, but that didn't work, so I reversed it ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` * **Operating System**:  ``` Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye Linux opensips 5.10.0-16-amd64 #1 SMP Debian 5.10.127-1 (2022-06-30) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3196 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3196(a)github.com>

3 4

git:master:4d58141a: rabbitmq: proper check for allocated pointer
by Daniel-Constantin Mierla 22 Aug '23

22 Aug '23

Module: kamailio Branch: master Commit: 4d58141ab84cf248e8c44a96181642ad0f187e80 URL: https://github.com/kamailio/kamailio/commit/4d58141ab84cf248e8c44a96181642a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-22T17:09:37+02:00 rabbitmq: proper check for allocated pointer --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/4d58141ab84cf248e8c44a96181642a… Patch: https://github.com/kamailio/kamailio/commit/4d58141ab84cf248e8c44a96181642a… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 50d143723e6..aa986ca9952 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -571,7 +571,7 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) // establish a new connection to RabbitMQ server *conn = amqp_new_connection(); - if(!conn) { + if(!*conn) { LM_ERR("FAIL: create AMQP connection\n"); return RABBITMQ_ERR_CREATE; }

1 0

[kamailio/kamailio] uac_reg tries A record resolve for auth_proxy on SRV only records (Issue #3547)
by 53c70r 22 Aug '23

22 Aug '23

I noticed that sometimes the trunk registration just fails after TTL expiry and the kamailio tries to resolve an A record for next_hop=<sip:reg.sip-trunk.telekom.de:5060;transport=tcp> where actually no A record exists resulting in an unregistered trunk for one register period. After the one failed period the SRV will result in correct CNAME resolving again and the trunk will be registered for one full hour (baes on TTL expiry of SRV record). ``` Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: uac [uac_reg.c:1138]: uac_reg_send(): using custom socket tcp:10.124.2.2:5060 to send request Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/socket_info.c:702]: grep_sock_info(): checking if host==us: 10==10 && [10.124.2.2] == [10.124.2.2] Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/socket_info.c:709]: grep_sock_info(): checking if port 5060 (advertise 5060) matches port 5060 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: tm [h_table.c:580]: tm_xdata_replace(): replace existing list in backup xd from new xd Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: tm [h_table.c:413]: build_cell(): created new cell 0x7fc7766aa400 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: tm [h_table.c:568]: tm_xdata_replace(): restore X/AVP msg context from backup data Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: tm [uac.c:468]: t_uac_prepare(): next_hop=<sip:reg.sip-trunk.telekom.de:5060;transport=tcp> Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:534]: _dns_hash_find(): (_sip._tcp.reg.sip-trunk.telekom.de(34), 33), h=666 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/resolve.c:999]: get_record(): skipping 0 NS (p=0x560cf3e135dc, end=0x560cf3e135dc) Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/resolve.c:1012]: get_record(): parsing 0 ARs (p=0x560cf3e135dc, end=0x560cf3e135dc) Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:1640]: dns_get_related(): (0x7fc7766f9ab8 (_sip._tcp.reg.sip-trunk.telekom.de, 33), 33, *(nil)) (0) Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:746]: dns_cache_add_unsafe(): adding _sip._tcp.reg.sip-trunk.telekom.de(34) 33 (flags=0) at 666 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:534]: _dns_hash_find(): (reg.sip-trunk.telekom.de(24), 1), h=400 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/resolve.c:784]: get_record(): lookup(reg.sip-trunk.telekom.de, 1) failed Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:768]: dns_cache_mk_bad_entry(): (reg.sip-trunk.telekom.de, 1, 60, 1) Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: <core> [core/dns_cache.c:708]: dns_cache_add(): adding reg.sip-trunk.telekom.de(24) 1 (flags=1) at 400 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: ERROR: <core> [core/resolve.c:1730]: sip_hostport2su(): could not resolve hostname: "reg.sip-trunk.telekom.de" Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: ERROR: tm [ut.h:309]: uri2dst2(): failed to resolve "reg.sip-trunk.telekom.de" Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: ERROR: tm [uac.c:491]: t_uac_prepare(): no socket found Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: DEBUG: tm [h_table.c:132]: free_cell_helper(): freeing transaction 0x7fc7766aa400 from uac.c:632 Aug 21 16:55:57 seelze-iptel1 kamailio[4116711]: ERROR: uac [uac_reg.c:1178]: uac_reg_send(): failed to send request for [siptrunk] ``` At this point it should not try to resolve reg.sip-trunk.telekom.de but instead one of the SRV CNAMES. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3547 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3547(a)github.com>

2 3

[kamailio/kamailio] cannot build with -DTLS_MALLOC_DBG=1 (Issue #3532)
by sergey-safarov 22 Aug '23

22 Aug '23

### Description I want debug memory usage by TLS module. To do this used command ``` make -C src/modules/tls CFLAGS="-DTLS_MALLOC_DBG=1" ``` And this output ``` [root@sbc-stage-a0 kamailio]# make -C src/modules/tls CFLAGS="-DTLS_MALLOC_DBG=1" make: Entering directory '/root/bak/kamailio/src/modules/tls' CC (gcc) [M tls.so] tls_domain.o CC (gcc) [M tls.so] tls_rand.o CC (gcc) [M tls.so] tls_map.o CC (gcc) [M tls.so] tls_cfg.o CC (gcc) [M tls.so] tls_mod.o CC (gcc) [M tls.so] tls_util.o CC (gcc) [M tls.so] tls_config.o CC (gcc) [M tls.so] tls_server.o CC (gcc) [M tls.so] tls_select.o CC (gcc) [M tls.so] tls_dump_vf.o CC (gcc) [M tls.so] tls_init.o tls_init.c:137:2: warning: #warning "tls module compiled with malloc debugging info (extra overhead)" [-Wcpp] #warning "tls module compiled with malloc debugging info (extra overhead)" ^~~~~~~ tls_init.c: In function ‘ser_malloc’: tls_init.c:218:5: warning: implicit declaration of function ‘_shm_malloc’; did you mean ‘shm_malloc’? [-Wimplicit-function-declaration] p=_shm_malloc(size+s, file, "via ser_malloc", line); ^~~~~~~~~~~ shm_malloc tls_init.c:218:4: warning: assignment to ‘void *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion] p=_shm_malloc(size+s, file, "via ser_malloc", line); ^ tls_init.c:224:39: error: invalid application of ‘sizeof’ to incomplete type ‘struct qm_frag’ ((struct qm_frag*)((char*)p-sizeof(struct qm_frag)))->func= ^~~~~~ tls_init.c: In function ‘ser_realloc’: tls_init.c:253:5: warning: implicit declaration of function ‘_shm_realloc’; did you mean ‘shm_realloc’? [-Wimplicit-function-declaration] p=_shm_realloc(ptr, size+s, file, "via ser_realloc", line); ^~~~~~~~~~~~ shm_realloc tls_init.c:253:4: warning: assignment to ‘void *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion] p=_shm_realloc(ptr, size+s, file, "via ser_realloc", line); ^ tls_init.c:259:39: error: invalid application of ‘sizeof’ to incomplete type ‘struct qm_frag’ ((struct qm_frag*)((char*)p-sizeof(struct qm_frag)))->func= ^~~~~~ tls_init.c: In function ‘tls_pre_init’: tls_init.c:684:7: warning: implicit declaration of function ‘CRYPTO_set_mem_ex_functions’; did you mean ‘CRYPTO_set_mem_functions’? [-Wimplicit-function-declaration] if (!CRYPTO_set_mem_ex_functions(ser_malloc, ser_realloc, ser_free)) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~ CRYPTO_set_mem_functions tls_init.c:684:60: error: ‘ser_free’ undeclared (first use in this function); did you mean ‘sk_free’? if (!CRYPTO_set_mem_ex_functions(ser_malloc, ser_realloc, ser_free)) { ^~~~~~~~ sk_free tls_init.c:684:60: note: each undeclared identifier is reported only once for each function it appears in make: *** [../../Makefile.rules:100: tls_init.o] Error 1 make: Leaving directory '/root/bak/kamailio/src/modules/tls' ``` ### Additional Information kamailio 5.6.4 with some customisation -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3532 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3532(a)github.com>

4 7

git:master:efd94f90: tls: updates to revive TLS_MALLOC_DBG
by Daniel-Constantin Mierla 22 Aug '23

22 Aug '23

Module: kamailio Branch: master Commit: efd94f90069d146d8133d7afd6276ce1c188556f URL: https://github.com/kamailio/kamailio/commit/efd94f90069d146d8133d7afd6276ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-22T11:10:36+02:00 tls: updates to revive TLS_MALLOC_DBG - it still requires q_malloc to be used - GH #3532 --- Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/efd94f90069d146d8133d7afd6276ce… Patch: https://github.com/kamailio/kamailio/commit/efd94f90069d146d8133d7afd6276ce… --- diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index d7399e8c792..e4a19d6ddad 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -260,14 +260,13 @@ static void *ser_malloc(size_t size, const char *file, int line) #endif s = backtrace2str(bt_buf, sizeof(bt_buf)); /* ugly hack: keep the bt inside the alloc'ed fragment */ - p = _shm_malloc(size + s, file, "via ser_malloc", line); + p = shm_mallocxp(size + s, file, "ser_malloc", line, "tls"); if(p == 0) { - LM_CRIT("tls - ser_malloc(%d)[%s:%d]==null, bt: %s\n", size, file, + LM_CRIT("tls - ser_malloc(%lu)[%s:%d]==null, bt: %s\n", size, file, line, bt_buf); } else { memcpy(p + size, bt_buf, s); - ((struct qm_frag *)((char *)p - sizeof(struct qm_frag)))->func = - p + size; + shm_setfunc(p, p + size); } #ifdef RAND_NULL_MALLOC } else { @@ -304,14 +303,13 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) || (random() % RAND_NULL_MALLOC)) { #endif s = backtrace2str(bt_buf, sizeof(bt_buf)); - p = _shm_realloc(ptr, size + s, file, "via ser_realloc", line); + p = shm_reallocxp(ptr, size + s, file, "ser_realloc", line, "tls"); if(p == 0) { - LM_CRIT("tls - ser_realloc(%p, %d)[%s:%d]==null, bt: %s\n", ptr, + LM_CRIT("tls - ser_realloc(%p, %lu)[%s:%d]==null, bt: %s\n", ptr, size, file, line, bt_buf); } else { memcpy(p + size, bt_buf, s); - ((struct qm_frag *)((char *)p - sizeof(struct qm_frag)))->func = - p + size; + shm_setfunc(p, p + size); } #ifdef RAND_NULL_MALLOC } else { @@ -328,6 +326,18 @@ static void *ser_realloc(void *ptr, size_t size, const char *file, int line) return p; } + +static void ser_free(void *ptr, const char *fname, int fline) +{ + if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) + pthread_mutex_lock(&ksr_tls_lock_shm); + if(ptr) { + shm_free(ptr); + } + if(ksr_tls_init_mode & TLS_MODE_PTHREAD_LOCK_SHM) + pthread_mutex_unlock(&ksr_tls_lock_shm); +} + #endif /* LIBRESSL_VERSION_NUMBER */ #else /*TLS_MALLOC_DBG */ @@ -710,7 +720,11 @@ int tls_pre_init(void) rf = NULL; ff = NULL; #ifdef TLS_MALLOC_DBG +#if OPENSSL_VERSION_NUMBER < 0x010100000L if(!CRYPTO_set_mem_ex_functions(ser_malloc, ser_realloc, ser_free)) { +#else + if(!CRYPTO_set_mem_functions(ser_malloc, ser_realloc, ser_free)) { +#endif #else if(!CRYPTO_set_mem_functions(ser_malloc, ser_realloc, ser_free)) { #endif

1 0

git:master:13976820: core: mem - shm api extended to enable setting func field of the chunk
by Daniel-Constantin Mierla 22 Aug '23

22 Aug '23

Module: kamailio Branch: master Commit: 1397682006dd7fc7df0cb95d92ff6424f7ad506f URL: https://github.com/kamailio/kamailio/commit/1397682006dd7fc7df0cb95d92ff642… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-08-22T11:10:36+02:00 core: mem - shm api extended to enable setting func field of the chunk - implemented for q_malloc(), being needed for reviving tls extra debug mode --- Modified: src/core/mem/memapi.h Modified: src/core/mem/q_malloc.c Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/1397682006dd7fc7df0cb95d92ff642… Patch: https://github.com/kamailio/kamailio/commit/1397682006dd7fc7df0cb95d92ff642… --- diff --git a/src/core/mem/memapi.h b/src/core/mem/memapi.h index b9448b4ace7..8b3b0c1e5a2 100644 --- a/src/core/mem/memapi.h +++ b/src/core/mem/memapi.h @@ -60,6 +60,8 @@ typedef void (*sr_mem_destroy_f)(void); typedef void (*sr_mem_mod_get_stats_f)(void *mbp, void **p); typedef void (*sr_mem_mod_free_stats_f)(void *mbp); +typedef void (*sr_setfunc_f)(void *mbp, void *p, char *func); + /*private memory api*/ typedef struct sr_pkg_api { @@ -142,6 +144,8 @@ typedef struct sr_shm_api sr_shm_glock_f xglock; /*memory managing global unlock*/ sr_shm_gunlock_f xgunlock; + /*memory chunk set func pointer*/ + sr_setfunc_f xsetfunc; } sr_shm_api_t; #endif diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index a3b9161ca3b..e1b48ecd63f 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -788,6 +788,29 @@ void *qm_reallocxf(void *qmp, void *p, size_t size) } +void qm_setfunc(void *qmp, void *p, char *func) +{ +#ifndef DBG_QM_MALLOC + LM_ERR("used with invalid compile options\n"); + return; +#else + struct qm_block *qm; + struct qm_frag *f; + + qm = (struct qm_block *)qmp; + + if((p) && (p > (void *)qm->last_frag_end || p < (void *)qm->first_frag)) { + LM_CRIT("BUG: bad pointer %p (out of memory block!) - " + "aborting\n", + p); + abort(); + } + f = (struct qm_frag *)((char *)p - sizeof(struct qm_frag)); + + f->func = func; +#endif +} + void qm_check(struct qm_block *qm) { struct qm_frag *f; @@ -1507,6 +1530,7 @@ int qm_malloc_init_shm_manager(void) ma.xfmodstats = qm_shm_mod_free_stats; ma.xglock = qm_shm_glock; ma.xgunlock = qm_shm_gunlock; + ma.xsetfunc = qm_setfunc; if(shm_init_api(&ma) < 0) { LM_ERR("cannot initialize the core shm api\n"); diff --git a/src/core/mem/shm.h b/src/core/mem/shm.h index 4db3a0e0101..c83c9dd48a6 100644 --- a/src/core/mem/shm.h +++ b/src/core/mem/shm.h @@ -99,6 +99,7 @@ extern sr_shm_api_t _shm_root; #define shm_global_lock() _shm_root.xglock(_shm_root.mem_block) #define shm_global_unlock() _shm_root.xgunlock(_shm_root.mem_block) +#define shm_setfunc(p, f) _shm_root.xsetfunc(_shm_root.mem_block, (p), (f)) void *shm_core_get_pool(void); int shm_init_api(sr_shm_api_t *ap);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2023