- sr-dev - kamailio.org

git:master:4a71d3c9: ctl: free rpc struct in case of error
by Daniel-Constantin Mierla 12 Feb '25

12 Feb '25

Module: kamailio Branch: master Commit: 4a71d3c9e6a4f92ef33ce8e62372b2c4dba62a56 URL: https://github.com/kamailio/kamailio/commit/4a71d3c9e6a4f92ef33ce8e62372b2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-12T17:48:42+01:00 ctl: free rpc struct in case of error --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/4a71d3c9e6a4f92ef33ce8e62372b2c… Patch: https://github.com/kamailio/kamailio/commit/4a71d3c9e6a4f92ef33ce8e62372b2c… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 1a9eb27bd79..cb1220b5c87 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -1027,7 +1027,7 @@ static int rpc_add(struct binrpc_ctx *ctx, char *fmt, ...) int err; str st; str *sp; - struct rpc_struct_l *rs; + struct rpc_struct_l *rs = NULL; str null_value = str_init("<null string>"); double d; @@ -1071,12 +1071,14 @@ static int rpc_add(struct binrpc_ctx *ctx, char *fmt, ...) if(err < 0) goto error_add; rs = new_rpc_struct(); - if(rs == 0) + if(rs == NULL) goto error_mem; rs->offset = binrpc_pkt_len(&ctx->out.pkt); err = binrpc_end_struct(&ctx->out.pkt); - if(err < 0) + if(err < 0) { + ctl_free(rs); goto error_add; + } clist_append(&ctx->out.structs, rs, next, prev); *(va_arg(ap, void **)) = rs; break; @@ -1182,7 +1184,7 @@ static int rpc_struct_add(struct rpc_struct_l *s, char *fmt, ...) va_list ap; int err; struct binrpc_val avp; - struct rpc_struct_l *rs; + struct rpc_struct_l *rs = NULL; str *sp; str null_value = str_init("<null string>"); @@ -1228,7 +1230,7 @@ static int rpc_struct_add(struct rpc_struct_l *s, char *fmt, ...) goto error_add; } rs = new_rpc_struct(); - if(rs == 0) { + if(rs == NULL) { LM_ERR("not enough memory (%c)\n", *fmt); goto error_mem; } @@ -1236,6 +1238,7 @@ static int rpc_struct_add(struct rpc_struct_l *s, char *fmt, ...) err = binrpc_end_struct(&s->pkt); if(err < 0) { LM_ERR("failed to end struct (%c)\n", *fmt); + ctl_free(rs); goto error_add; } clist_append(&s->substructs, rs, next, prev); @@ -1291,8 +1294,8 @@ static int rpc_array_add(struct rpc_struct_l *s, char *fmt, ...) va_list ap; int err; str st; - str *sp; - struct rpc_struct_l *rs; + str *sp = NULL; + struct rpc_struct_l *rs = NULL; str null_value = str_init("<null string>"); double d; @@ -1336,12 +1339,14 @@ static int rpc_array_add(struct rpc_struct_l *s, char *fmt, ...) if(err < 0) goto error_add; rs = new_rpc_struct(); - if(rs == 0) + if(rs == NULL) goto error_mem; rs->offset = binrpc_pkt_len(&s->pkt); err = binrpc_end_struct(&s->pkt); - if(err < 0) + if(err < 0) { + ctl_free(rs); goto error_add; + } clist_append(&s->substructs, rs, next, prev); *(va_arg(ap, void **)) = rs; break;

1 0

[kamailio/kamailio] Kamailio passive instance tries to send dialog keepalives after service restart (Issue #4077)
by akabihno 12 Feb '25

12 Feb '25

### Description Kamailio is running on 2 nodes using DMQ for HA. Following DMQ parameters are set: ``` modparam("dmq", "server_address", "sip:LOCAL_IP:DMQ_PORT") modparam("dmq", "notification_address", "sip:OTHER_NODE_IP:DMQ_PORT") modparam("dmq", "multi_notify", 0) modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "replicate_socket_info", 1) modparam("dmq_usrloc", "batch_msg_contacts", 50) modparam("dmq_usrloc", "batch_size", 10000) modparam("dmq_usrloc", "batch_usleep", 500000) ``` If kamailio is restarted on passive instance, it tries to send keepalives for DMQ replicated dialog, producing errors ### Troubleshooting #### Reproduction - Have set dialog properties "ka-src", "ka-dst": ``` if (is_method("INVITE")) { setflag(FLT_ACC); #!ifdef WITH_DIALOG dlg_manage(); dlg_set_property("ka-src"); dlg_set_property("ka-dst"); #!endif } ``` - Have calls on active instance and DMQ replicated dialogs on passive instance ``` kamcmd dlg.list { h_entry: 936 h_id: 7534 ref: 2 call-id: inds188n38bjr7tsa2hb from_uri: sip:90123@10.1.2.3 to_uri: sip:0012345@10.1.2.3 state: 4 start_ts: 1734441148 init_ts: 1734441142 end_ts: 0 duration: 119 timeout: 1734484347 lifetime: 43200 dflags: 0 sflags: 0 iflags: 64 caller: { tag: c91qu93uc5 contact: sip:hp3405ho@iacvttr6b897.invalid;transport=ws;ob;alias=10.5.6.7~39402~6 cseq: 2 route_set: socket: <null string> } callee: { tag: 32fd1f16-2fd3-4924-9423-4267871f4ea8 contact: sip:10.2.3.4:5060 cseq: 0 route_set: socket: <null string> } profiles: { } variables: { } } ``` - Restart kamailio service on passive instance #### Debugging Data #### Log Messages ``` Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) WARNING: <core> [core/msg_translator.c:3024]: via_builder(): TCP/TLS connection (id: 0) for WebSocket could not be found Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: tm [t_msgbuilder.c:1423]: assemble_via(): via building failed Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: tm [t_msgbuilder.c:1614]: build_uac_req(): error while assembling Via Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: tm [uac.c:552]: t_uac_prepare(): Error while building message Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: dialog [dlg_req_within.c:810]: dlg_send_ka(): failed to send the OPTIONS request Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: <core> [core/udp_server.c:810]: udp_send(): sendto(sock, buf: 0x7f3736a421b0, len: 329, 0, dst: (10.5.2.192:5060), tolen: 16) - err: Invalid argument (22) Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) CRITICAL: <core> [core/udp_server.c:817]: udp_send(): invalid sendtoparameters Dec 17 13:15:34 hostname.redacted.com docker[31099]: one possible reason is the server is bound to localhost and Dec 17 13:15:34 hostname.redacted.com docker[31099]: attempts to send to the net Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: tm [../../core/forward.h:245]: msg_send_buffer(): udp_send failed Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: tm [uac.c:708]: send_prepared_request_impl(): Attempt to send to precreated request failed Dec 17 13:15:34 hostname.redacted.com docker[31099]: 34(42) ERROR: <core> [core/udp_server.c:810]: udp_send(): sendto(sock, buf: 0x7f3736a42000, len: 329, 0, dst: (10.5.2.192:5060), tolen: 16) - err: Invalid argument (22) Dec 17 13:15:34 hostname.redacted.com docker[31099]: 34(42) CRITICAL: <core> [core/udp_server.c:817]: udp_send(): invalid sendtoparameters Dec 17 13:15:34 hostname.redacted.com docker[31099]: one possible reason is the server is bound to localhost and Dec 17 13:15:34 hostname.redacted.com docker[31099]: attempts to send to the net Dec 17 13:15:34 hostname.redacted.com docker[31099]: 34(42) ERROR: tm [../../core/forward.h:245]: msg_send_buffer(): udp_send failed ``` #### SIP Traffic ### Possible Solutions ### Additional Information ``` version: kamailio 5.8.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, MEM_JOIN_FREE, 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_SEND_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 on 13:38:04 Nov 12 2024 with gcc 13.2.1 ``` * **Operating System**: Running https://ghcr.io/kamailio/kamailio-ci:5.8.4-alpine in docker as systemd service ``` Host system: lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 16.04.3 LTS Release: 16.04 Codename: xenial uname -a Linux _hostname redacted_ 4.4.0-1052-aws #61-Ubuntu SMP Mon Feb 12 23:05:58 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux docker -v Docker version 20.10.7, build f0df350 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4077 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4077(a)github.com>

2 2

Build failed in Jenkins: kamailio57-repos » amd64,bullseye,master #8
by kamailio＠sipwise.com 12 Feb '25

12 Feb '25

See <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> Changes: ------------------------------------------ Started by upstream project "kamailio57-repos" build number 8 originally caused by: Started by upstream project "kamailio57-binaries" build number 10 originally caused by: Started by upstream project "kamailio57-source" build number 27 originally caused by: Started by an SCM change Running as SYSTEM Building on the built-in node in workspace <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> [master] $ /bin/sh -xe /tmp/jenkins2066408270855458561.sh + echo * Removing files workspace before copying artifacts from another project. * * Removing files workspace before copying artifacts from another project. * + rm -f ./* Copied 51 artifacts from "kamailio57-binaries » amd64,bullseye" build number 10 [master] $ /bin/sh -xe /tmp/jenkins1310728410749387094.sh + /home/admin/kamailio-deb-jenkins/scripts/jdg-repository + set -e + '[' -z /srv/repository/kamailio57 ']' + repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + echo '*** Sourcing /etc/jenkins/debian_glue ***' *** Sourcing /etc/jenkins/debian_glue *** + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio57 ']' + false + '[' '' = true ']' + ARCHITECTURES='amd64 i386 source' + COMPONENTS=main + UDEB_COMPONENTS=main + '[' 1 -gt 1 ']' + '[' 1 -lt 1 ']' + REPOS=bullseye ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.23.0+0~20240619103048.364~1.gbp807dcd + '[' -n 0.23.0+0~20240619103048.364~1.gbp807dcd ']' + echo '*** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd ***' *** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd *** + '[' -z '' ']' + echo '*** Repository variable DEFAULT_REPOSITORY is unset, using default [] ***' *** Repository variable DEFAULT_REPOSITORY is unset, using default [] *** + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio57 ']' + mkdir -p /srv/repository/kamailio57/conf ++ id -un + chown jenkins /srv/repository/kamailio57/conf + touch /srv/repository/kamailio57/conf/distributions + '[' -z 508EA4C8 ']' ++ id -un + flock --timeout 5 9 + grep -q '^$Codename\|Suite$: bullseye$' /srv/repository/kamailio57/conf/distributions + echo 'Codename/repository bullseye exists already, ignoring request to add again.' Codename/repository bullseye exists already, ignoring request to add again. + exit 0 ++ id -un + rm -f /var/lock/jdg-generate-reprepro-codename.jenkins + set -u + umask 022 + PATH=/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin + export QEMU_RESERVED_VA=0x0 + QEMU_RESERVED_VA=0x0 + export TERM=dumb + TERM=dumb ++ date + echo '*** Starting /usr/bin/build-and-provide-package at Wed 12 Feb 2025 01:15:53 AM UTC ***' *** Starting /usr/bin/build-and-provide-package at Wed 12 Feb 2025 01:15:53 AM UTC *** ++ sed -e 's/^$[0-9]*$.*/\1/' + start_seconds=5326767 ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.23.0+0~20240619103048.364~1.gbp807dcd + '[' -n 0.23.0+0~20240619103048.364~1.gbp807dcd ']' + echo '*** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd ***' *** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd *** ++ dpkg --print-architecture + HOST_ARCH=amd64 + '[' -n amd64 ']' + echo '*** Identified host architecture amd64 ***' *** Identified host architecture amd64 *** + trap bailout SIGHUP SIGINT SIGQUIT SIGABRT SIGALRM SIGTERM + checks_and_defaults + '[' -z /srv/repository/kamailio57 ']' + local repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio57 ']' + false + '[' -n '' ']' + '[' -z kamailio57-repos/architecture=amd64,distribution=bullseye,label=master ']' + '[' -z amd64 ']' + set_debootstrap + '[' -n '' ']' + '[' amd64 = amd64 ']' + DEBOOTSTRAP=debootstrap + return 0 + '[' -z '' ']' + REPREPRO_OPTS='-v --waitforlock 1000' + echo '*** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 ***' *** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 *** + REPREPRO_CMD=reprepro + '[' -z '' ']' + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio57 ']' + '[' -z '' ']' + PBUILDER_HOOKDIR=/usr/share/jenkins-debian-glue/pbuilder-hookdir/ + '[' -z '' ']' + '[' -z '' ']' + FREIGHT_VARLIB=/var/lib/freight + FREIGHT_VARCACHE=/var/cache/freight + FREIGHT_CONF=/etc/freight.conf + '[' '' = true ']' + clean_workspace ++ pwd + echo '*** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…]>: ***' *** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…]>: *** + ls -la ./ total 12 drwxr-xr-x 3 jenkins jenkins 4096 Feb 12 01:15 . drwxr-xr-x 3 jenkins jenkins 4096 Feb 12 01:15 .. drwxr-xr-x 2 jenkins jenkins 4096 Feb 12 01:15 binaries + identify_package_name + PACKAGE=kamailio57 + PACKAGE=kamailio57 + '[' -n kamailio57 ']' + echo '*** Identified Debian package name kamailio57 ***' *** Identified Debian package name kamailio57 *** + set_base_path + '[' -n binaries/ ']' + echo '*** Using provided binaries/ as BASE_PATH ***' *** Using provided binaries/ as BASE_PATH *** + build_info + '[' -n bullseye ']' + echo '*** Using supplied repository name bullseye ***' *** Using supplied repository name bullseye *** + identify_sourcefile + '[' -n '' ']' + echo '*** Identifying newest package version ***' *** Identifying newest package version *** + newest_version= + for file in "${BASE_PATH}/"*.dsc ++ awk '/^Source: / {print $2}' binaries//kamailio_5.7.6+bpo11.dsc + SOURCE_PACKAGE=kamailio ++ basename binaries//kamailio_5.7.6+bpo11.dsc .dsc + p=kamailio_5.7.6+bpo11 + '[' kamailio_5.7.6+bpo11 = '*' ']' + cur_version=5.7.6+bpo11 + '[' -z '' ']' + newest_version=5.7.6+bpo11 + echo '*** Found package version 5.7.6+bpo11 ***' *** Found package version 5.7.6+bpo11 *** + sourcefile='binaries//kamailio_*5.7.6+bpo11.dsc' + echo '*** Using binaries//kamailio_*5.7.6+bpo11.dsc (version: 5.7.6+bpo11)' *** Using binaries//kamailio_*5.7.6+bpo11.dsc (version: 5.7.6+bpo11) + dist_and_arch_settings + '[' -z amd64 ']' + '[' amd64 = all ']' + arch=amd64 + echo '*** architecture is set to amd64 ***' *** architecture is set to amd64 *** + '[' -n bullseye ']' + local DIST=bullseye + '[' -n '' ']' + echo '*** Using cowbuilder base for distribution bullseye ***' *** Using cowbuilder base for distribution bullseye *** + COWBUILDER_DIST=bullseye + '[' -n '' ']' + COWBUILDER_BASE=/var/cache/pbuilder/base-bullseye-amd64.cow + echo '*** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-bullseye-amd64.cow as cowbuilder base.cow ***' *** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-bullseye-amd64.cow as cowbuilder base.cow *** + local lockfiles=/run/lock/bullseye-amd64 + build_lockfile=/run/lock/bullseye-amd64.building.1575155 + update_lockfile=/run/lock/bullseye-amd64.update + update_lockfile_pid=/run/lock/bullseye-amd64.update.1575155 + '[' -n true ']' + echo '*** Config variable '\''PROVIDE_ONLY'\'' is set, ignoring request to run cowbuilder. ***' *** Config variable 'PROVIDE_ONLY' is set, ignoring request to run cowbuilder. *** + '[' -n '' ']' + deploy_to_releases + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + reprepro_wrapper + '[' -n '' ']' + '[' -d /srv/repository/kamailio57 ']' + '[' -r /srv/repository/kamailio57/conf/distributions ']' + grep -q '^$Codename\|Suite$: bullseye$' /srv/repository/kamailio57/conf/distributions + remove_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_REMOVAL *** + return 0 + remove_missing_binary_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL *** + return 0 + echo '*** Including packages in repository bullseye ***' *** Including packages in repository bullseye *** ++ get_arch_changes ++ case ${architecture} in ++ echo amd64 + reprepro -b /srv/repository/kamailio57 -v --waitforlock 1000 --ignore=wrongdistribution --ignore=uploaders --ignore=surprisingbinary include bullseye <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> File "pool/main/k/kamailio/kamailio_5.7.6+bpo11_amd64.deb" is already registered with different checksums! md5 expected: 0476e074842bb457e84f501bdb9bc526, got: a5916b0ccfb5a35a6e8b9e432d386860 sha1 expected: 46b8e82a6f227f5814404bcec28cfdb229cdd83f, got: 0bf3b86d239b06d0316e1c7a913d38ddfc48876f sha256 expected: c84ef99085b456f61d88ef20b1a569cfdf506552bb18ee48275fd8b9a9414dad, got: 2e31fe81cc37eb33a67f05ec108f867d4642457c25b69a9423e251944c46e163 size expected: 9441148, got: 9440900 There have been errors! + '[' 254 -eq 0 ']' + bailout 1 'Error: Failed to include binary package in bullseye repository.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to include binary package in bullseye repository.' ']' + echo 'Error: Failed to include binary package in bullseye repository.' Error: Failed to include binary package in bullseye repository. + rm -f /run/lock/bullseye-amd64.building.1575155 + '[' -r /run/lock/bullseye-amd64.update.1575155 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> to avoid problems in next run. *** + rm -f <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> + '[' -n '' ']' + '[' -n '' ']' + '[' -n 5326767 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=0 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Wed 12 Feb 2025 01:15:53 AM UTC [running 0 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Wed 12 Feb 2025 01:15:53 AM UTC [running 0 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts

1 0

git:master:f37940b9: db_sqlite: added prefix to internal helper function
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: f37940b9a113ab79611f851334af7f8fbb7b3f6a URL: https://github.com/kamailio/kamailio/commit/f37940b9a113ab79611f851334af7f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T15:27:26+01:00 db_sqlite: added prefix to internal helper function --- Modified: src/modules/db_sqlite/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f37940b9a113ab79611f851334af7f8… Patch: https://github.com/kamailio/kamailio/commit/f37940b9a113ab79611f851334af7f8… --- diff --git a/src/modules/db_sqlite/dbase.c b/src/modules/db_sqlite/dbase.c index a82f8e59546..2ff40fc0898 100644 --- a/src/modules/db_sqlite/dbase.c +++ b/src/modules/db_sqlite/dbase.c @@ -369,7 +369,7 @@ static int type_to_dbtype(int type) } } -static str *str_dup(const char *_s) +static str *sqlt_str_dup(const char *_s) { str *s; int len = strlen(_s); @@ -432,7 +432,8 @@ int db_sqlite_store_result(const db1_con_t *_h, db1_res_t **_r) const char *decltype; int dbtype; - RES_NAMES(res)[i] = str_dup(sqlite3_column_name(conn->stmt, i)); + RES_NAMES(res) + [i] = sqlt_str_dup(sqlite3_column_name(conn->stmt, i)); if(RES_NAMES(res)[i] == NULL) goto no_mem; decltype = sqlite3_column_decltype(conn->stmt, i);

1 0

git:master:3fb1d783: ims_registrar_scscf: updates for lib/ims macro names
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: 3fb1d7832006d290ee1c2e15ea1e731dc0768b5f URL: https://github.com/kamailio/kamailio/commit/3fb1d7832006d290ee1c2e15ea1e731… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T15:26:27+01:00 ims_registrar_scscf: updates for lib/ims macro names --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/3fb1d7832006d290ee1c2e15ea1e731… Patch: https://github.com/kamailio/kamailio/commit/3fb1d7832006d290ee1c2e15ea1e731… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index b1af5189a8d..25425af7a1f 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -2478,7 +2478,7 @@ void uac_request_cb(struct cell *t, int type, struct tmcb_params *ps) } done: if(watcher_contact) { - str_free(*watcher_contact, shm); + ims_str_free(*watcher_contact, shm); shm_free(watcher_contact); *(ps->param) = 0; } @@ -2618,10 +2618,10 @@ void send_notification(reg_notification *n) watcher_contact = 0; done: out_of_memory: - str_free(h, pkg); - str_free(content, pkg); + ims_str_free(h, pkg); + ims_str_free(content, pkg); if(watcher_contact) { - str_free(*watcher_contact, shm); + ims_str_free(*watcher_contact, shm); shm_free(watcher_contact); } free_tm_dlg(td);

1 0

git:master:b9c36860: ims_qos_npn: updates for lib/ims macro names
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: b9c36860fc8a91fc6c73b456ff64b6191f61813b URL: https://github.com/kamailio/kamailio/commit/b9c36860fc8a91fc6c73b456ff64b61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T15:25:30+01:00 ims_qos_npn: updates for lib/ims macro names --- Modified: src/modules/ims_qos_npn/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/b9c36860fc8a91fc6c73b456ff64b61… Patch: https://github.com/kamailio/kamailio/commit/b9c36860fc8a91fc6c73b456ff64b61… --- diff --git a/src/modules/ims_qos_npn/rx_avp.c b/src/modules/ims_qos_npn/rx_avp.c index 54afddaa354..fd17533c99a 100644 --- a/src/modules/ims_qos_npn/rx_avp.c +++ b/src/modules/ims_qos_npn/rx_avp.c @@ -2038,7 +2038,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) LOG(L_INFO, "P-Access-Network-Info from Diameter is [%.*s]\n", dst->len, dst->s); if(!dst->len) { - str_free(*dst, pkg); + ims_str_free(*dst, pkg); } return (dst->len > 1); }

1 0

git:master:f1abcba4: ims_charging: updates for lib/ims macro names
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: f1abcba4eeabccf96a8d16c2e63a47b27db62f88 URL: https://github.com/kamailio/kamailio/commit/f1abcba4eeabccf96a8d16c2e63a47b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T15:24:20+01:00 ims_charging: updates for lib/ims macro names --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/Ro_data.h Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/f1abcba4eeabccf96a8d16c2e63a47b… Patch: https://github.com/kamailio/kamailio/commit/f1abcba4eeabccf96a8d16c2e63a47b…

1 0

git:master:c45c7116: lib/ims: renamed specific macros with pretty generic name
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: c45c71164ed40e06cdfab4ceda292d29d2d1459f URL: https://github.com/kamailio/kamailio/commit/c45c71164ed40e06cdfab4ceda292d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T15:23:34+01:00 lib/ims: renamed specific macros with pretty generic name --- Modified: src/lib/ims/ims_getters.c Modified: src/lib/ims/ims_getters.h --- Diff: https://github.com/kamailio/kamailio/commit/c45c71164ed40e06cdfab4ceda292d2… Patch: https://github.com/kamailio/kamailio/commit/c45c71164ed40e06cdfab4ceda292d2… --- diff --git a/src/lib/ims/ims_getters.c b/src/lib/ims/ims_getters.c index 44f1a0be34d..8d97a7a54f9 100644 --- a/src/lib/ims/ims_getters.c +++ b/src/lib/ims/ims_getters.c @@ -1303,20 +1303,21 @@ int cscf_get_p_charging_vector( if(!header->body.s || !header->body.len) return 0; - str_dup(header_body, header->body, pkg); + ims_str_dup(header_body, header->body, pkg); LM_DBG("p_charging_vector body is %.*s\n", header_body.len, header_body.s); p = strtok(header_body.s, " ;:\r\t\n\"="); loop: - if(p == NULL || p > (header_body.s + header_body.len)) + if(p == NULL || p > (header_body.s + header_body.len)) { return 1; + } if(strncmp(p, "icid-value", 10) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); if(p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); - return 0; + goto error; } temp.s = p; temp.len = 0; @@ -1332,11 +1333,10 @@ int cscf_get_p_charging_vector( p = strtok(NULL, " ;:\r\t\n\"="); goto loop; } else if(strncmp(p, "orig-ioi", 8) == 0) { - p = strtok(NULL, " ;:\r\t\n\"="); if(p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); - return 0; + goto error; } temp.s = p; temp.len = 0; @@ -1352,11 +1352,10 @@ int cscf_get_p_charging_vector( p = strtok(NULL, " ;:\r\t\n\"="); goto loop; } else if(strncmp(p, "term-ioi", 8) == 0) { - p = strtok(NULL, " ;:\r\t\n\"="); if(p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); - return 0; + goto error; } temp.s = p; temp.len = 0; @@ -1374,10 +1373,12 @@ int cscf_get_p_charging_vector( } LM_DBG("end\n"); - str_free(header_body, pkg); + ims_str_free(header_body, pkg); return 1; out_of_memory: PKG_MEM_ERROR; +error: + ims_str_free(header_body, pkg); return 0; } diff --git a/src/lib/ims/ims_getters.h b/src/lib/ims/ims_getters.h index 081a5ae1934..4d10c00077d 100644 --- a/src/lib/ims/ims_getters.h +++ b/src/lib/ims/ims_getters.h @@ -80,7 +80,7 @@ enum cscf_dialog_direction * @param src - source src * @param mem - type of mem to duplicate into (shm/pkg) */ -#define str_dup(dst, src, mem) \ +#define ims_str_dup(dst, src, mem) \ do { \ if((src).len) { \ (dst).s = mem##_malloc((src).len); \ @@ -102,7 +102,7 @@ enum cscf_dialog_direction * @param x - the str to free * @param mem - type of memory that the content is using (shm/pkg) */ -#define str_free(x, mem) \ +#define ims_str_free(x, mem) \ do { \ if((x).s) \ mem##_free((x).s); \

1 0

git:master:2ba6d4ff: core: check for unexpected long value return by pathconf()
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: 2ba6d4ff2727031e7bca5d3d1da016bfe508b8df URL: https://github.com/kamailio/kamailio/commit/2ba6d4ff2727031e7bca5d3d1da016b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T12:41:26+01:00 core: check for unexpected long value return by pathconf() --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/2ba6d4ff2727031e7bca5d3d1da016b… Patch: https://github.com/kamailio/kamailio/commit/2ba6d4ff2727031e7bca5d3d1da016b… --- diff --git a/src/core/ut.h b/src/core/ut.h index f1829f73ca0..3a3d66202b6 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -546,7 +546,8 @@ inline static int pathmax(void) #endif if(pathmax == 0) { /* init */ pathmax = pathconf("/", _PC_PATH_MAX); - pathmax = (pathmax <= 0) ? PATH_MAX_GUESS : pathmax + 1; + pathmax = (pathmax <= 0 || pathmax >= INT_MAX - 1) ? PATH_MAX_GUESS + : pathmax + 1; } return pathmax; }

1 0

git:master:6c12477f: core: pass fd - check for unexpected read size overflow
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: 6c12477f1dad2279431d703d1a4f63fcfc6543b8 URL: https://github.com/kamailio/kamailio/commit/6c12477f1dad2279431d703d1a4f63f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T11:30:34+01:00 core: pass fd - check for unexpected read size overflow --- Modified: src/core/pass_fd.c --- Diff: https://github.com/kamailio/kamailio/commit/6c12477f1dad2279431d703d1a4f63f… Patch: https://github.com/kamailio/kamailio/commit/6c12477f1dad2279431d703d1a4f63f… --- diff --git a/src/core/pass_fd.c b/src/core/pass_fd.c index eae20206fd5..77431dbf293 100644 --- a/src/core/pass_fd.c +++ b/src/core/pass_fd.c @@ -35,6 +35,7 @@ #include <sys/socket.h> #include <sys/uio.h> #include <stdlib.h> /* for NULL definition on openbsd */ +#include <limits.h> #include <errno.h> #include <string.h> #ifdef NO_MSG_WAITALL @@ -289,9 +290,14 @@ int receive_fd(int unix_socket, void *data, int data_len, int *fd, int flags) /* blocking recv_all */ n = recv_all( unix_socket, (char *)data + ret, data_len - ret, MSG_WAITALL); - if(n >= 0) + if(n >= 0) { + if(ret >= INT_MAX - n) { + LM_ERR("int size overflowing: %d + %d\n", ret, n); + ret = -1; + goto error; + } ret += n; - else { + } else { ret = n; goto error; }

1 0

git:master:6fb38cb3: tsilo: clean allocated memory on error for append by contact
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: 6fb38cb33095c11a1c90d7b88140ac159b9fd5ca URL: https://github.com/kamailio/kamailio/commit/6fb38cb33095c11a1c90d7b88140ac1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T10:25:34+01:00 tsilo: clean allocated memory on error for append by contact --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/6fb38cb33095c11a1c90d7b88140ac1… Patch: https://github.com/kamailio/kamailio/commit/6fb38cb33095c11a1c90d7b88140ac1… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index 5119b3f5a21..6af49d59dd3 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -459,19 +459,19 @@ static int w_ts_append_by_contact2( if(ts_check_uri(&ruri) < 0) { LM_ERR("failed to parse R-URI.\n"); - return -1; + goto error; } /* parse Contact header */ if((!_msg->contact && parse_headers(_msg, HDR_CONTACT_F, 0) != 0) || !_msg->contact) { LM_WARN("missing contact header or the value is empty/malformed.\n"); - return -1; + goto error; } if(_msg->contact) { if(parse_contact(_msg->contact) < 0) { LM_WARN("failed to parse Contact header.\n"); - return -1; + goto error; } if(parse_uri(((struct contact_body *)_msg->contact->parsed) ->contacts->uri.s, @@ -481,7 +481,7 @@ static int w_ts_append_by_contact2( != 0) { if(ts_check_uri(&_msg->contact->body) < 0) { /* one more attempt */ LM_WARN("failed to parse Contact header.\n"); - return -1; + goto error; } } @@ -490,7 +490,7 @@ static int w_ts_append_by_contact2( tmp_contact.s = (char *)pkg_malloc(tmp_contact.len + 1); if(tmp_contact.s == NULL) { PKG_MEM_ERROR; - return -1; + goto error; } memcpy(tmp_contact.s, ((struct contact_body *)_msg->contact->parsed)->contacts->uri.s, @@ -502,7 +502,7 @@ static int w_ts_append_by_contact2( < 0) { /* one more attempt */ LM_ERR("problems when calling ts_append_contact(), cannot copy " "Contact parameter.\n"); - return -1; + goto error; } } } @@ -516,6 +516,18 @@ static int w_ts_append_by_contact2( pkg_free(tmp_contact.s); return rc; + +error: + if(ruri.s != NULL) { + pkg_free(ruri.s); + } + if(contact.s != NULL) { + pkg_free(contact.s); + } + if(tmp_contact.s != NULL) { + pkg_free(tmp_contact.s); + } + return -1; } /** @@ -538,11 +550,11 @@ static int ki_ts_append_by_contact(sip_msg_t *_msg, str *_table, str *_ruri) /* parse Contact header */ if((!_msg->contact && parse_headers(_msg, HDR_CONTACT_F, 0) != 0) || !_msg->contact) - return -1; + goto error; if(_msg->contact) { if(parse_contact(_msg->contact) < 0) - return -1; + goto error; if(parse_uri(((struct contact_body *)_msg->contact->parsed) ->contacts->uri.s, ((struct contact_body *)_msg->contact->parsed) @@ -550,7 +562,7 @@ static int ki_ts_append_by_contact(sip_msg_t *_msg, str *_table, str *_ruri) &curi) != 0) { if(ts_check_uri(&_msg->contact->body) < 0) /* one more attempt */ - return -1; + goto error; } tmp_contact.len = ((struct contact_body *)_msg->contact->parsed) @@ -558,7 +570,7 @@ static int ki_ts_append_by_contact(sip_msg_t *_msg, str *_table, str *_ruri) tmp_contact.s = (char *)pkg_malloc(tmp_contact.len + 1); if(tmp_contact.s == NULL) { PKG_MEM_ERROR; - return -1; + goto error; } memcpy(tmp_contact.s, ((struct contact_body *)_msg->contact->parsed)->contacts->uri.s, @@ -568,7 +580,7 @@ static int ki_ts_append_by_contact(sip_msg_t *_msg, str *_table, str *_ruri) if(pkg_str_dup(&contact, &tmp_contact) < 0) { if(pkg_str_dup(&contact, &_msg->contact->body) < 0) /* one more attempt */ - return -1; + goto error; } } @@ -580,6 +592,18 @@ static int ki_ts_append_by_contact(sip_msg_t *_msg, str *_table, str *_ruri) pkg_free(tmp_contact.s); return rc; + +error: + if(ruri.s != NULL) { + pkg_free(ruri.s); + } + if(contact.s != NULL) { + pkg_free(contact.s); + } + if(tmp_contact.s != NULL) { + pkg_free(tmp_contact.s); + } + return -1; } /**

1 0

[kamailio/kamailio] xhttp_prom module with custom tags (Issue #4021)
by Christian Berger 11 Feb '25

11 Feb '25

### Description In Prometheus there is the possibility to tag values with tags. Those tags can then be used provide context to those values, for example to filter them. ### Expected behavior It would be great if there was a way to provide custom tags to the metrics. These would essentially just be a static string between the name of the metric and its value. Example: `system_load15{host="wurst23.dev.sipgate.net",hostname_short="wurst32"} 0.4` This could probably be achieved by having an `xhttp_prom_ending` parameter similar to the `xhttp_prom_beginning` as we essentially just want to append a static string right after the metric name. #### Actual observed behavior `kamailio_sip_lb_de_core_rcv_replies_1xx_invite 1773 1731419851663` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4021 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4021(a)github.com>

4 7

git:master:69086114: utils/kamcmd: cmake fix on custom command
by Victor Seva 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: 69086114ad6eee016d1b7634f37c5ef31d4543e0 URL: https://github.com/kamailio/kamailio/commit/69086114ad6eee016d1b7634f37c5ef… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-11T01:35:56+01:00 utils/kamcmd: cmake fix on custom command --- Modified: utils/kamcmd/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/69086114ad6eee016d1b7634f37c5ef… Patch: https://github.com/kamailio/kamailio/commit/69086114ad6eee016d1b7634f37c5ef… --- diff --git a/utils/kamcmd/CMakeLists.txt b/utils/kamcmd/CMakeLists.txt index 0d1ec28b4c5..f984415ed44 100644 --- a/utils/kamcmd/CMakeLists.txt +++ b/utils/kamcmd/CMakeLists.txt @@ -46,7 +46,7 @@ add_custom_command( -e "s#/usr/sbin/#${CMAKE_INSTALL_FULL_SBINDIR}/#g" -e "s#/usr/lib/${CFG_NAME}/modules/#${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/#g" -e "s#/usr/share/doc/${CFG_NAME}/#${CMAKE_INSTALL_FULL_DOCDIR}/#g" -e - "s#$(SRC_NAME)#$(MAIN_NAME)#g" < ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8 > + "s#${SRC_NAME}#${MAIN_NAME}#g" < ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8 > ${CMAKE_CURRENT_BINARY_DIR}/kamcmd.8 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8)

1 0

[kamailio/kamailio] app_python3: evaluate LIBS variable imediately in Makefile (PR #4085)
by sergey-safarov 08 Feb '25

08 Feb '25

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description latest `make` version does not evaluate variables immediately. PR explicitly evaluates the LIBS makefile variable. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4085 -- Commit Summary -- * app_python3: evaluate LIBS variable imediately in Makefile -- File Changes -- M src/modules/app_python3/Makefile (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4085.patch https://github.com/kamailio/kamailio/pull/4085.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4085 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4085(a)github.com>

5 96

git:master:342e1ad3: core: initial support for generic core parameter definition
by Daniel-Constantin Mierla 08 Feb '25

08 Feb '25

Module: kamailio Branch: master Commit: 342e1ad30872e23641134599ad0c519bfc6db7ce URL: https://github.com/kamailio/kamailio/commit/342e1ad30872e23641134599ad0c519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-08T08:42:00+01:00 core: initial support for generic core parameter definition - allow coreparam[name]=value - simplify adding new core parameters without the need to define rules in lex and yacc --- Added: src/core/coreparam.c Added: src/core/coreparam.h Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/342e1ad30872e23641134599ad0c519… Patch: https://github.com/kamailio/kamailio/commit/342e1ad30872e23641134599ad0c519…

1 0

[kamailio/kamailio] secfilter: search by prefix is dependant on order of added items (PR #4143)
by Simon Darienko 08 Feb '25

08 Feb '25

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #4141 #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4143 -- Commit Summary -- * secfilter: secf_check_dst function is dependant on order of items added to the list -- File Changes -- M src/modules/secfilter/secfilter.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4143.patch https://github.com/kamailio/kamailio/pull/4143.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4143 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4143(a)github.com>

1 4

[kamailio/kamailio] Secfilter `secf_check_dst` function is dependant on order of items added to the list (Issue #4141)
by Ihor Olkhovskyi 07 Feb '25

07 Feb '25

If destinations is being added in `secfilter` starting with the lowest length, all other subsequent destinations with higher length are ignored. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4141 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4141(a)github.com>

2 2

[kamailio/kamailio] secfilter: fix secf_check_dst bug (PR #4142)
by Jose Luis Verdeguer 07 Feb '25

07 Feb '25

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #4141 (replace XXXX with an open issue number) #### Description  Fix problem with dst.len value You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4142 -- Commit Summary -- * secfilter: fix secf_check_dst bug -- File Changes -- M src/modules/secfilter/secfilter.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4142.patch https://github.com/kamailio/kamailio/pull/4142.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4142 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4142(a)github.com>

1 1

git:master:578c2abb: secfilter: fix secf_check_dst bug
by Jose Luis Verdeguer 07 Feb '25

07 Feb '25

Module: kamailio Branch: master Commit: 578c2abb36b9101bfc1dddc1505f7239e928b98e URL: https://github.com/kamailio/kamailio/commit/578c2abb36b9101bfc1dddc1505f723… Author: pepelux <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2025-02-07T19:23:39+01:00 secfilter: fix secf_check_dst bug --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/578c2abb36b9101bfc1dddc1505f723… Patch: https://github.com/kamailio/kamailio/commit/578c2abb36b9101bfc1dddc1505f723… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index ff95ec74762..2518a7d7487 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -341,6 +341,7 @@ static int ki_check_dst(struct sip_msg *msg, str *val) } } else { /* Any match */ + dst.len = val->len; if(dst.len > list->s.len) dst.len = list->s.len; if(cmpi_str(&list->s, &dst) == 0) {

1 0

git:master:68de38d5: dispatcher: switch to ksr_xrand() to be able to use custom rand function
by Daniel-Constantin Mierla 07 Feb '25

07 Feb '25

Module: kamailio Branch: master Commit: 68de38d51fb3773fbc5dbce0068bec1597783386 URL: https://github.com/kamailio/kamailio/commit/68de38d51fb3773fbc5dbce0068bec1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-07T07:52:19+01:00 dispatcher: switch to ksr_xrand() to be able to use custom rand function --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/68de38d51fb3773fbc5dbce0068bec1… Patch: https://github.com/kamailio/kamailio/commit/68de38d51fb3773fbc5dbce0068bec1… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index ca1636edbd2..9968eab5537 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -57,6 +57,7 @@ #include "../../core/script_cb.h" #include "../../core/kemi.h" #include "../../core/fmsg.h" +#include "../../core/rand/ksrxrand.h" #include "ds_ht.h" #include "api.h" @@ -790,7 +791,7 @@ void shuffle_uint100array(unsigned int *arr) if(arr == NULL) return; for(j = 0; j < 100; j++) { - k = j + (kam_rand() % (100 - j)); + k = j + (ksr_xrand() % (100 - j)); t = arr[j]; arr[j] = arr[k]; arr[k] = t; @@ -807,7 +808,7 @@ void shuffle_char100array(char *arr) if(arr == NULL) return; for(j = 0; j < 100; j++) { - k = j + (kam_rand() % (100 - j)); + k = j + (ksr_xrand() % (100 - j)); t = arr[j]; arr[j] = arr[k]; arr[k] = t; @@ -2614,7 +2615,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } break; case DS_ALG_RANDOM: /* 6 - random selection */ - hash = kam_rand(); + hash = ksr_xrand(); break; case DS_ALG_HASHPV: /* 7 - hash on PV value */ if(ds_hash_pvar(msg, &hash) != 0) { diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index b0d37bce288..c72b53bc7e2 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -35,7 +35,6 @@ #include "../../core/pvar.h" #include "../../core/xavp.h" #include "../../core/parser/msg_parser.h" -#include "../../core/rand/kam_rand.h" #include "../../modules/tm/tm_load.h"

1 0

git:master:c33f1f49: core: ksrxrand - framework to set custom rand/srand functions
by Daniel-Constantin Mierla 07 Feb '25

07 Feb '25

Module: kamailio Branch: master Commit: c33f1f494f1e7ff9deb887f58644fb21934f9b0e URL: https://github.com/kamailio/kamailio/commit/c33f1f494f1e7ff9deb887f58644fb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-07T07:44:45+01:00 core: ksrxrand - framework to set custom rand/srand functions --- Added: src/core/rand/ksrxrand.c Added: src/core/rand/ksrxrand.h --- Diff: https://github.com/kamailio/kamailio/commit/c33f1f494f1e7ff9deb887f58644fb2… Patch: https://github.com/kamailio/kamailio/commit/c33f1f494f1e7ff9deb887f58644fb2… --- diff --git a/src/core/rand/ksrxrand.c b/src/core/rand/ksrxrand.c new file mode 100644 index 00000000000..e0938cf47d5 --- /dev/null +++ b/src/core/rand/ksrxrand.c @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2025 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <string.h> + +#include "../dprint.h" + +#include "fastrand.h" +#include "ksrxrand.h" + +/** + * wrapper function for rand()/random() + */ +int ksr_wrand(void) +{ +#if RAND_MAX < INT_MAX + return (int)random(); +#else + return rand(); +#endif +} + +/** + * wrapper function for srand()/srandom() + */ +void ksr_wsrand(unsigned int seed) +{ +#if RAND_MAX < INT_MAX + return srandom(seed); +#else + return srand(seed); +#endif +} + +/** + * wrapper function for fastrand() + */ +int ksr_wfastrand(void) +{ + return (int)(fastrand() % ((unsigned)KSR_XRAND_MAX + 1)); +} + +/** + * global with internal RAND API + */ +ksr_xrand_t _ksr_xrand_api = {.xrand = ksr_wrand, .xsrand = ksr_wsrand}; + +/** + * + */ +int ksr_xrand_set(char *name) +{ + if(strcmp(name, "fast") == 0) { + _ksr_xrand_api.xrand = ksr_wfastrand; + _ksr_xrand_api.xsrand = fastrand_seed; + return 0; + } + if((strcmp(name, "rand") == 0) || (strcmp(name, "rand") == 0)) { + /* default - nothing to do */ + return 0; + } + LM_WARN("unknown rand engine: %s\n", name); + return -1; +} diff --git a/src/core/rand/ksrxrand.h b/src/core/rand/ksrxrand.h new file mode 100644 index 00000000000..51f026e9bc6 --- /dev/null +++ b/src/core/rand/ksrxrand.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2025 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef __KSRXRAND_H__ +#define __KSRXRAND_H__ + +#include <limits.h> +#include <stdlib.h> + +#if RAND_MAX < INT_MAX +#define KSR_XRAND_MAX ((int)(0x7FFFFFFF)) /* (1<<31) - 1 */ +#else +#define KSR_XRAND_MAX RAND_MAX +#endif + +typedef int (*ksr_xrand_f)(void); +typedef void (*ksr_xsrand_f)(unsigned int seed); + +typedef struct ksr_xrand +{ + ksr_xrand_f xrand; + ksr_xsrand_f xsrand; +} ksr_xrand_t; + +extern ksr_xrand_t _ksr_xrand_api; + +#define ksr_xrand() _ksr_xrand_api.xrand() +#define ksr_xsrand(s) _ksr_xrand_api.xsrand(s) + +int ksr_xrand_set(char *name); + +#endif

1 0

Problems Compiling 5.8.5
by Christian Berger 06 Feb '25

06 Feb '25

Hi, building 5.8.5 fails for us. In src/core/mem/f_malloc.c, there is a call to sr_event_exec using the define "SREV_PKG_UPDATE_STAT" which is only defined if "MALLOC_STATS" is defined. However in the use there is no check for the define, so it fails with the default debian bookworm build. This might be a bug. Regards Christian -- Christian Berger - berger(a)sipgate.de Telefon: +49 (0)211-63 55 55-0 Telefax: +49 (0)211-63 55 55-22 sipgate GmbH - Gladbacher Str. 74 - 40219 Düsseldorf HRB Düsseldorf 39841 - Geschäftsführer: Thilo Salmon, Tim Mois Steuernummer: 106/5724/7147, Umsatzsteuer-ID: DE219349391 www.sipgate.de - www.sipgate.co.uk

1 1

git:master:ad8f017b: nghttp2: check return for setsockopt TCP_NODELAY
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: ad8f017b38e90746790ec9789f01abe6fab46e1b URL: https://github.com/kamailio/kamailio/commit/ad8f017b38e90746790ec9789f01abe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:26:22+01:00 nghttp2: check return for setsockopt TCP_NODELAY --- Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ad8f017b38e90746790ec9789f01abe… Patch: https://github.com/kamailio/kamailio/commit/ad8f017b38e90746790ec9789f01abe… --- diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index 3b8816aca0c..79b81a20c01 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -202,7 +202,10 @@ static http2_session_data *create_http2_session_data( session_data = malloc(sizeof(http2_session_data)); memset(session_data, 0, sizeof(http2_session_data)); session_data->app_ctx = app_ctx; - setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val)); + if(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val)) + < 0) { + LM_ERR("failed to set TCP_NODELAY socket option\n"); + } session_data->bev = bufferevent_openssl_socket_new(app_ctx->evbase, fd, ssl, BUFFEREVENT_SSL_ACCEPTING, BEV_OPT_CLOSE_ON_FREE | BEV_OPT_DEFER_CALLBACKS);

1 0

git:master:6e76452c: ims_auth: amf passed as parameter to resync local auth vector
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: 6e76452c11189620663da84f879400575c673792 URL: https://github.com/kamailio/kamailio/commit/6e76452c11189620663da84f8794005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:15:58+01:00 ims_auth: amf passed as parameter to resync local auth vector --- Modified: src/modules/ims_auth/auth_vector.c Modified: src/modules/ims_auth/auth_vector.h Modified: src/modules/ims_auth/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/6e76452c11189620663da84f8794005… Patch: https://github.com/kamailio/kamailio/commit/6e76452c11189620663da84f8794005… --- diff --git a/src/modules/ims_auth/auth_vector.c b/src/modules/ims_auth/auth_vector.c index c973d8acfb3..a681490f71a 100644 --- a/src/modules/ims_auth/auth_vector.c +++ b/src/modules/ims_auth/auth_vector.c @@ -80,12 +80,12 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, - uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc) + uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc, + uint8_t amf[2]) { uint8_t rand[16]; uint8_t op_c[16]; uint8_t ak[6]; - uint8_t amf[2]; uint8_t sqnMS[6]; uint8_t mac_s[8]; uint8_t xmac_s[8]; diff --git a/src/modules/ims_auth/auth_vector.h b/src/modules/ims_auth/auth_vector.h index 1b90cfe9f21..0b0457258b0 100644 --- a/src/modules/ims_auth/auth_vector.h +++ b/src/modules/ims_auth/auth_vector.h @@ -32,7 +32,8 @@ auth_vector *auth_vector_make_local(uint8_t k[16], uint8_t op[16], int opIsOPc, uint8_t amf[2], uint8_t sqn[6]); int auth_vector_resync_local(uint8_t sqnMSout[6], auth_vector *av, - uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc); + uint8_t auts[14], uint8_t k[16], uint8_t op[16], int opIsOPc, + uint8_t amf[2]); void sqn_increment(uint8_t sqn[6]); #endif diff --git a/src/modules/ims_auth/authorize.c b/src/modules/ims_auth/authorize.c index 44bfbc4f91a..0d16e658893 100644 --- a/src/modules/ims_auth/authorize.c +++ b/src/modules/ims_auth/authorize.c @@ -708,10 +708,12 @@ int ims_resync_auth(struct sip_msg *msg, str *proute_name, str *prealm) int resync_result = 0; if(_ims_auth_data.flags & IMS_AUTH_FLAG_OPC_SET) { resync_result = auth_vector_resync_local(aud->sqn, av, - auts_bin, _ims_auth_data.k, _ims_auth_data.op_c, 1); + auts_bin, _ims_auth_data.k, _ims_auth_data.op_c, 1, + _ims_auth_data.amf); } else { resync_result = auth_vector_resync_local(aud->sqn, av, - auts_bin, _ims_auth_data.k, _ims_auth_data.op, 0); + auts_bin, _ims_auth_data.k, _ims_auth_data.op, 0, + _ims_auth_data.amf); } if(resync_result != 0) {

1 0

git:master:12ef4b4e: core: rand - switch to inline functions from macros
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: 12ef4b4e64e596a3ce29775266cef571796f0850 URL: https://github.com/kamailio/kamailio/commit/12ef4b4e64e596a3ce29775266cef57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:09:20+01:00 core: rand - switch to inline functions from macros - rand/random has no parameter --- Modified: src/core/rand/kam_rand.h --- Diff: https://github.com/kamailio/kamailio/commit/12ef4b4e64e596a3ce29775266cef57… Patch: https://github.com/kamailio/kamailio/commit/12ef4b4e64e596a3ce29775266cef57… --- diff --git a/src/core/rand/kam_rand.h b/src/core/rand/kam_rand.h index 271f61f220d..12b988a0852 100644 --- a/src/core/rand/kam_rand.h +++ b/src/core/rand/kam_rand.h @@ -24,12 +24,24 @@ #if RAND_MAX < INT_MAX #define KAM_RAND_MAX ((int)(0x7FFFFFFF)) /* (1<<31) - 1 */ -#define kam_rand(x) ((int)random(x)) -#define kam_srand(x) srandom(x) +static inline int kam_rand(void) +{ + return (int)random(); +} +static inline void kam_srand(unsigned int seed) +{ + return srandom(seed); +} #else #define KAM_RAND_MAX RAND_MAX -#define kam_rand(x) rand(x) -#define kam_srand(x) srand(x) +static inline int kam_rand(void) +{ + return rand(); +} +static inline void kam_srand(unsigned int seed) +{ + return srand(seed); +} #endif #endif

1 0

git:master:462f9730: core: socket info - use unsigned for current size in buffer for get flags
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: 462f9730eb55a3abbd50b9170eb6318eb43eb999 URL: https://github.com/kamailio/kamailio/commit/462f9730eb55a3abbd50b9170eb6318… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-06T08:07:46+01:00 core: socket info - use unsigned for current size in buffer for get flags --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/462f9730eb55a3abbd50b9170eb6318… Patch: https://github.com/kamailio/kamailio/commit/462f9730eb55a3abbd50b9170eb6318… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 24243fea153..4fd44fec2dc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1439,7 +1439,7 @@ static int get_flags(int family) struct ifinfomsg *ifi; char buf[NETLINK_BUFFER_SIZE]; char *p = buf; - int nll = 0; + unsigned int nll = 0; int nl_sock = -1; fill_nl_req(req, RTM_GETLINK, family); @@ -1453,7 +1453,7 @@ static int get_flags(int family) } while(1) { - if((sizeof(buf) - nll) == 0) { + if(sizeof(buf) <= nll) { LM_ERR("netlink buffer overflow in get_flags"); goto error; }

1 0

git:master:efce6e76: ims_isc: check return for parsing headers and anchor lump
by Daniel-Constantin Mierla 06 Feb '25

06 Feb '25

Module: kamailio Branch: master Commit: efce6e76ba20f7b02101fb2f44cb149b609f4bef URL: https://github.com/kamailio/kamailio/commit/efce6e76ba20f7b02101fb2f44cb149… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-05T16:44:49+01:00 ims_isc: check return for parsing headers and anchor lump --- Modified: src/modules/ims_isc/mark.c --- Diff: https://github.com/kamailio/kamailio/commit/efce6e76ba20f7b02101fb2f44cb149… Patch: https://github.com/kamailio/kamailio/commit/efce6e76ba20f7b02101fb2f44cb149… --- diff --git a/src/modules/ims_isc/mark.c b/src/modules/ims_isc/mark.c index d97e29b30a0..cbd0c17e3cd 100644 --- a/src/modules/ims_isc/mark.c +++ b/src/modules/ims_isc/mark.c @@ -147,9 +147,15 @@ int isc_mark_get_from_lumps(struct sip_msg *msg, isc_mark *mark) memset(mark, 0, sizeof(isc_mark)); - parse_headers(msg, HDR_EOH_F, 0); + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_ERR("failed to parse headers\n"); + return 0; + } - anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0); + if(anchor_lump(msg, msg->headers->name.s - msg->buf, 0, 0) == NULL) { + LM_ERR("failed to create the anchor lump\n"); + return 0; + } lmp = msg->add_rm; while(lmp) {

1 0

git:master:65645c76: textops: catch return 0 when removing via param
by Daniel-Constantin Mierla 05 Feb '25

05 Feb '25

Module: kamailio Branch: master Commit: 65645c761e94cedde04f100764d5c506590cb200 URL: https://github.com/kamailio/kamailio/commit/65645c761e94cedde04f100764d5c50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-05T13:30:17+01:00 textops: catch return 0 when removing via param --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/65645c761e94cedde04f100764d5c50… Patch: https://github.com/kamailio/kamailio/commit/65645c761e94cedde04f100764d5c50… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 94fba1c32a4..db1929e0127 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -5026,11 +5026,7 @@ static int ki_via_param_rm(sip_msg_t *msg, str *name, int idx) LM_ERR("no memory for delete operation\n"); return -1; } - if(ret < 0) { - ret = 1; - } else { - ret++; - } + ret++; } } if(ret > 0) { @@ -5041,7 +5037,7 @@ static int ki_via_param_rm(sip_msg_t *msg, str *name, int idx) } } } - return ret; + return (ret == 0) ? -1 : ret; } /**

1 0

git:5.8:ed3d6809: htable: do not print item name before is computed
by Victor Seva 05 Feb '25

05 Feb '25

Module: kamailio Branch: 5.8 Commit: ed3d6809dcc66ac18efb313fbf9e3f7bd130a19d URL: https://github.com/kamailio/kamailio/commit/ed3d6809dcc66ac18efb313fbf9e3f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-05T11:27:51+01:00 htable: do not print item name before is computed (cherry picked from commit e2193b9cd7f59377c54e0424c0d4a1628a5a60de) --- Modified: src/modules/htable/ht_var.c --- Diff: https://github.com/kamailio/kamailio/commit/ed3d6809dcc66ac18efb313fbf9e3f7… Patch: https://github.com/kamailio/kamailio/commit/ed3d6809dcc66ac18efb313fbf9e3f7… --- diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index e79c7869ee5..4d7707f958b 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -38,8 +38,8 @@ int pv_get_ht_cell(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(hpv->ht == NULL) { hpv->ht = ht_get_table(&hpv->htname); if(hpv->ht == NULL) { - LM_ERR("htable not found for getting $sht(%.*s=>%.*s)\n", - hpv->htname.len, hpv->htname.s, htname.len, htname.s); + LM_ERR("htable not found for getting $sht(%.*s=>...)\n", + hpv->htname.len, hpv->htname.s); return pv_get_null(msg, param, res); } } @@ -77,8 +77,8 @@ int pv_set_ht_cell( if(hpv->ht == NULL) hpv->ht = ht_get_table(&hpv->htname); if(hpv->ht == NULL) { - LM_ERR("htable not found for setting $sht(%.*s=>%.*s)\n", - hpv->htname.len, hpv->htname.s, htname.len, htname.s); + LM_ERR("htable not found for setting $sht(%.*s=>...)\n", + hpv->htname.len, hpv->htname.s); return -1; }

1 0

git:master:1ed6671c: websocket: use helper function to get signed int time
by Daniel-Constantin Mierla 05 Feb '25

05 Feb '25

Module: kamailio Branch: master Commit: 1ed6671c802e525046ca56008bdc3d52f2bbd46d URL: https://github.com/kamailio/kamailio/commit/1ed6671c802e525046ca56008bdc3d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-05T09:30:55+01:00 websocket: use helper function to get signed int time --- Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/1ed6671c802e525046ca56008bdc3d5… Patch: https://github.com/kamailio/kamailio/commit/1ed6671c802e525046ca56008bdc3d5… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index b41cb2e91d9..9fa3125343c 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -28,6 +28,7 @@ #include "../../core/locking.h" #include "../../core/str.h" +#include "../../core/ut.h" #include "../../core/tcp_conn.h" #include "../../core/fmsg.h" #include "../../core/counters.h" @@ -219,7 +220,7 @@ int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol) wsconn_listadd(wsconn_id_hash[wsc->id_hash], wsc, id_next, id_prev); /* Add to the end of the WebSocket used list */ - wsc->last_used = (int)time(NULL); + wsc->last_used = ksr_time_sint(NULL, NULL); if(wsconn_used_list->head == NULL) wsconn_used_list->head = wsconn_used_list->tail = wsc; else { @@ -358,7 +359,7 @@ int wsconn_update(ws_connection_t *wsc) } WSCONN_LOCK; - wsc->last_used = (int)time(NULL); + wsc->last_used = ksr_time_sint(NULL, NULL); if(wsconn_used_list->tail == wsc) /* Already at the end of the list */ goto end; @@ -742,7 +743,7 @@ static int ws_rpc_add_node( pong = wsc->awaiting_pong ? "awaiting Pong, " : ""; - interval = (int)time(NULL) - wsc->last_used; + interval = ksr_time_sint(NULL, NULL) - wsc->last_used; if(wsc->sub_protocol == SUB_PROTOCOL_SIP) sub_protocol = "sip"; else if(wsc->sub_protocol == SUB_PROTOCOL_MSRP) diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 04a4132f13d..e7e97b40ce4 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -37,6 +37,7 @@ #include "../../core/events.h" #include "../../core/receive.h" #include "../../core/str.h" +#include "../../core/ut.h" #include "../../core/tcp_conn.h" #include "../../core/tcp_read.h" #include "../../core/tcp_server.h" @@ -796,8 +797,8 @@ static int ws_send_crlf(ws_connection_t *wsc, int opcode) void ws_keepalive(unsigned int ticks, void *param) { - int check_time = - (int)time(NULL) - cfg_get(websocket, ws_cfg, keepalive_timeout); + int check_time = ksr_time_sint(NULL, NULL) + - cfg_get(websocket, ws_cfg, keepalive_timeout); ws_connection_id_t *list_head = NULL; ws_connection_t *wsc = NULL;

1 0

[kamailio/kamailio] Module nghttp2 fails to compile with gcc 14 (Issue #4135)
by Ben Kaufman 05 Feb '25

05 Feb '25

### Description Compiling nghttp2 is failing for me in Alpine 3.21, which uses gcc 14 (14.2.0). It looks like the issue is that the header file `nghttp2.h` need to be explicitly included in the `nghttp2_mod.c` files. This is the error when running `make` inside of `src/modules/nghttp2` (after compiling kamailio as normal): ``` /home/builder/kamailio_src/src/modules/nghttp2 # make make: --libs: No such file or directory make: --libs: No such file or directory make: --libs: No such file or directory make: --libs: No such file or directory CC (gcc) [M nghttp2.so] nghttp2_mod.o nghttp2_mod.c: In function 'ksr_nghttp2_send_reply': nghttp2_mod.c:317:22: error: implicit declaration of function 'nghttp2_submit_response'; did you mean 'nghttp2_submit_response2'? [-Wimplicit-function-declaration] 317 | rv = nghttp2_submit_response(_ksr_nghttp2_ctx.session, | ^~~~~~~~~~~~~~~~~~~~~~~ | nghttp2_submit_response2 make: *** [../../Makefile.rules:100: nghttp2_mod.o] Error 1 ``` ### Troubleshooting Compilation works on Debian 12, so checked difference in `make` and `gcc` versions. Note that the `make: --libs: No such file or directory` appear to be from a different issue with `make` 4.4 not recursively expanding variables. From gcc's documentation it looks like implicit function declarations are no longer possible https://gcc.gnu.org/gcc-14/porting_to.html #### Reproduction Compile Kamailio 6.0.0 (with default config), then compile the nghttp2 module ### Possible Solutions Explicitly import `nghttp2.h` in `nghttp2_mod.c` and `nghttp2_server.c`. This is outside of my normal wheelhouse, but I was able to do this and successfully compile the module: ##### Diff for `nghttp2_mod.c`: ``` @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> #include <arpa/inet.h> +#include <nghttp2/nghttp2.h> #include "../../core/sr_module.h" #include "../../core/dprint.h" ``` ##### Diff for `nghttp2_server.c`: ``` @@ -23,6 +23,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <nghttp2/nghttp2.h> #include "nghttp2_server.h" #define OUTPUT_WOULDBLOCK_THRESHOLD (1 << 16) ```  ### Additional Information Kamailio 6.0.0 with gcc 14.2.0 * **Operating System**:  ``` /home/builder/kamailio_src/src/modules/nghttp2 # lsb_release -a No LSB modules are available. Distributor ID: Alpine Description: Alpine Linux v3.21 Release: 3.21.2 Codename: n/a /home/builder/kamailio_src/src/modules/nghttp2 # uname -a Linux 89562285153f 5.15.167.4-microsoft-standard-WSL2 #1 SMP Tue Nov 5 00:21:55 UTC 2024 x86_64 Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4135 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4135(a)github.com>

2 3

[kamailio/kamailio] nghttp2: compilation with gcc 14 (PR #4136)
by Ben Kaufman 05 Feb '25

05 Feb '25

- Explicitly include nghttp2.h file GH #4135   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #4135 #### Description  Explicitly include nghttp2.h file in `src/modules/nghttp2/nghttp2_mod.c` and `src/modules/nghttp2/nghttp2_server.c` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4136 -- Commit Summary -- * nghttp2: compilation with gcc 14 -- File Changes -- M src/modules/nghttp2/nghttp2_mod.c (1) M src/modules/nghttp2/nghttp2_server.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4136.patch https://github.com/kamailio/kamailio/pull/4136.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4136 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4136(a)github.com>

2 2

git:master:1e5a91be: nghttp2: compilation with gcc 14
by Daniel-Constantin Mierla 05 Feb '25

05 Feb '25

Module: kamailio Branch: master Commit: 1e5a91be57de02beedbd2b3b03031647b51eb7b6 URL: https://github.com/kamailio/kamailio/commit/1e5a91be57de02beedbd2b3b0303164… Author: Kaufman <bkaufman(a)bcmone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-05T09:27:05+01:00 nghttp2: compilation with gcc 14 - Explicitly include nghttp2.h file GH #4135 --- Modified: src/modules/nghttp2/nghttp2_mod.c Modified: src/modules/nghttp2/nghttp2_server.c --- Diff: https://github.com/kamailio/kamailio/commit/1e5a91be57de02beedbd2b3b0303164… Patch: https://github.com/kamailio/kamailio/commit/1e5a91be57de02beedbd2b3b0303164… --- diff --git a/src/modules/nghttp2/nghttp2_mod.c b/src/modules/nghttp2/nghttp2_mod.c index 28b80544107..cf9c70e66a4 100644 --- a/src/modules/nghttp2/nghttp2_mod.c +++ b/src/modules/nghttp2/nghttp2_mod.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> #include <arpa/inet.h> +#include <nghttp2/nghttp2.h> #include "../../core/sr_module.h" #include "../../core/dprint.h" diff --git a/src/modules/nghttp2/nghttp2_server.c b/src/modules/nghttp2/nghttp2_server.c index ba0290bc4ac..3b8816aca0c 100644 --- a/src/modules/nghttp2/nghttp2_server.c +++ b/src/modules/nghttp2/nghttp2_server.c @@ -23,6 +23,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <nghttp2/nghttp2.h> #include "nghttp2_server.h" #define OUTPUT_WOULDBLOCK_THRESHOLD (1 << 16)

1 0

[kamailio/kamailio] geoip: module relocated to archive (PR #3978)
by Victor Seva 05 Feb '25

05 Feb '25

related #3886 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3978 -- Commit Summary -- * geoip: module relocated to archive -- File Changes -- M src/Makefile.groups (8) D src/modules/geoip/Makefile (9) D src/modules/geoip/README (166) D src/modules/geoip/doc/Makefile (4) D src/modules/geoip/doc/geoip.xml (42) D src/modules/geoip/doc/geoip_admin.xml (199) D src/modules/geoip/geoip_mod.c (157) D src/modules/geoip/geoip_pv.c (421) D src/modules/geoip/geoip_pv.h (40) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3978.patch https://github.com/kamailio/kamailio/pull/3978.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3978 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3978(a)github.com>

4 6

git:master:0aedee8c: msilo: use helper function to get time as signed int
by Daniel-Constantin Mierla 05 Feb '25

05 Feb '25

Module: kamailio Branch: master Commit: 0aedee8cde7b67b531dabc8a7207b0df1cfdf6a9 URL: https://github.com/kamailio/kamailio/commit/0aedee8cde7b67b531dabc8a7207b0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-05T08:21:39+01:00 msilo: use helper function to get time as signed int --- Modified: src/modules/msilo/msfuncs.c Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/0aedee8cde7b67b531dabc8a7207b0d… Patch: https://github.com/kamailio/kamailio/commit/0aedee8cde7b67b531dabc8a7207b0d… --- diff --git a/src/modules/msilo/msfuncs.c b/src/modules/msilo/msfuncs.c index 581b30390d4..2851708e894 100644 --- a/src/modules/msilo/msfuncs.c +++ b/src/modules/msilo/msfuncs.c @@ -282,6 +282,7 @@ int m_build_body(str *body, time_t date, str msg, time_t sdate) int ms_extract_time(str *time_str, int *time_val) { struct tm stm; + time_t ttime; int i; if(time_str == NULL || time_str->s == NULL || time_str->len <= 0 @@ -394,7 +395,8 @@ int ms_extract_time(str *time_str, int *time_val) return -1; } } - *time_val = (int)mktime(&stm); + ttime = mktime(&stm); + *time_val = ksr_time_sint(&ttime, NULL); return 0; } diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 0654eecf54f..11713279167 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -743,7 +743,7 @@ static int m_store_addrs(sip_msg_t *msg, str *owner, str *srcaddr, str *dstaddr) } /* current time */ - val = (int)(unsigned long long)time(NULL); + val = ksr_time_sint(NULL, NULL); /* add expiration time */ db_keys[nr_keys] = &sc_exp_time; @@ -1286,7 +1286,7 @@ void m_clean_silo(unsigned int ticks, void *param) db_keys[0] = &sc_exp_time; db_vals[0].type = DB1_INT; db_vals[0].nul = 0; - db_vals[0].val.int_val = (int)time(NULL); + db_vals[0].val.int_val = ksr_time_sint(NULL, NULL); if(msilo_dbf.delete(db_con, db_keys, db_ops, db_vals, 1) < 0) LM_DBG("ERROR cleaning expired messages\n"); } @@ -1383,7 +1383,7 @@ void m_send_ontimer(unsigned int ticks, void *param) db_vals[1].type = DB1_INT; db_vals[1].nul = 0; ttime = time(NULL); - db_vals[1].val.int_val = (int)ttime; + db_vals[1].val.int_val = ksr_time_sint(&ttime, NULL); if(msilo_dbf.use_table(db_con, &ms_db_table) < 0) { LM_ERR("failed to use_table\n");

1 0

git:master:a086b234: core: ut.h - function split time in two signed integers
by Daniel-Constantin Mierla 04 Feb '25

04 Feb '25

Module: kamailio Branch: master Commit: a086b23458f1019e9f3ac5d66ae6f19074ff543e URL: https://github.com/kamailio/kamailio/commit/a086b23458f1019e9f3ac5d66ae6f19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-04T19:35:52+01:00 core: ut.h - function split time in two signed integers - the lower 4 bytes are returned, the upper 4 bytes can be stored in the second parameter --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/a086b23458f1019e9f3ac5d66ae6f19… Patch: https://github.com/kamailio/kamailio/commit/a086b23458f1019e9f3ac5d66ae6f19… --- diff --git a/src/core/ut.h b/src/core/ut.h index 29faca83fc2..f1829f73ca0 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1155,6 +1155,12 @@ static inline int strno2int(str *val, unsigned int *mask) } } +/** + * split time value in two (upper and lower 4-bytes) unsigned int values + * - time value representation on 8 bytes: UUUULLLL + * - lower 4 bytes are returned (LLLL) + * - upper 4 bytes can be stored in second paramter (UUUU) + */ static inline unsigned int ksr_time_uint(time_t *tv, unsigned int *tu) { unsigned int tl; /* lower 4 bytes */ @@ -1176,6 +1182,33 @@ static inline unsigned int ksr_time_uint(time_t *tv, unsigned int *tu) return tl; } +/** + * split time value in two (upper and lower 4-bytes) signed int values + * - time value representation on 8 bytes: UUUULLLL + * - lower 4 bytes are returned (LLLL) + * - upper 4 bytes can be stored in second paramter (UUUU) + */ +static inline int ksr_time_sint(time_t *tv, int *tu) +{ + int tl; /* lower 4 bytes */ + long long v64; + time_t t; + + if(tv != NULL) { + t = *tv; + } else { + t = time(NULL); + } + v64 = (long long)t; + tl = (int)(v64 & 0xFFFFFFFFLL); + if(tu != NULL) { + /* upper 4 bytes */ + *tu = (int)((v64 >> 32) & 0xFFFFFFFFLL); + } + + return tl; +} + /* converts a username into uid:gid, * returns -1 on error & 0 on success */ int user2uid(int *uid, int *gid, char *user);

1 0

git:master:88b96d71: topos_htable: use the xtag also for base64 key
by Daniel-Constantin Mierla 04 Feb '25

04 Feb '25

Module: kamailio Branch: master Commit: 88b96d717be2a66a9351c01c861408743be40fc4 URL: https://github.com/kamailio/kamailio/commit/88b96d717be2a66a9351c01c8614087… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-04T12:04:39+01:00 topos_htable: use the xtag also for base64 key --- Modified: src/modules/topos_htable/topos_htable_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/88b96d717be2a66a9351c01c8614087… Patch: https://github.com/kamailio/kamailio/commit/88b96d717be2a66a9351c01c8614087… --- diff --git a/src/modules/topos_htable/topos_htable_storage.c b/src/modules/topos_htable/topos_htable_storage.c index 52044df8734..043652e5280 100644 --- a/src/modules/topos_htable/topos_htable_storage.c +++ b/src/modules/topos_htable/topos_htable_storage.c @@ -277,8 +277,8 @@ static int tps_htable_load_initial_method_branch(tps_data_t *md, tps_data_t *sd) TPS_BASE64_SIZE - 1); base64url_enc(md->a_callid.s, md->a_callid.len, _tps_base64_buf[1], TPS_BASE64_SIZE - 1); - base64url_enc(md->b_tag.s, md->b_tag.len, _tps_base64_buf[2], - TPS_BASE64_SIZE - 1); + base64url_enc( + xtag.s, xtag.len, _tps_base64_buf[2], TPS_BASE64_SIZE - 1); base64url_enc( xuuid.s, xuuid.len, _tps_base64_buf[3], TPS_BASE64_SIZE - 1);

1 0

git:master:5f8adb62: msrp: send failure response after referening the buffer
by Daniel-Constantin Mierla 04 Feb '25

04 Feb '25

Module: kamailio Branch: master Commit: 5f8adb625b6bae81ef44613d774106bf3a943bb0 URL: https://github.com/kamailio/kamailio/commit/5f8adb625b6bae81ef44613d774106b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-04T08:05:28+01:00 msrp: send failure response after referening the buffer --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/5f8adb625b6bae81ef44613d774106b… Patch: https://github.com/kamailio/kamailio/commit/5f8adb625b6bae81ef44613d774106b… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index e1a378ee7ac..072fe5f7529 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -183,8 +183,8 @@ int msrp_cmap_save(msrp_frame_t *mf) LM_DBG("expires is greater than max value\n"); xhdrs.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Max-Expires: %d\r\n", msrp_auth_max_expires); - msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs); xhdrs.s = sbuf; + msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs); return -4; } if(msrp_frame_get_first_from_path(mf, &fpeer) < 0) {

1 0

[kamailio/kamailio] APKBUILD missing modules (Issue #4131)
by Ben Kaufman 03 Feb '25

03 Feb '25

### Description The Alpine Linux APKBUILD file is a bit old and some of the modules added over the last few years are missing. I compile my own .apk files with an updated APKBUILD file which I can provide in a pull request. These modules are: - app_python3s - app_ruby_proc - call_obj - dlgs - ims_qos_npn - jwt - kafka - keepalive - kemix - lost - lrkproxy - math - mqtt - nghttp2 - posops - presence_dfks - pv_headers - pvtpl - secfilter - slack - ss7ops - sworker - topos_htable - xhttp_prom #### Reproduction The modules simply aren't listed in the APKBUILD file ### Possible Solutions Update APKBUILD file. ### Additional Information * **Operating System**: * Alpine Linux, 3.20, 3.21 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4131 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4131(a)github.com>

2 3

git:master:b70ade3e: cmake: Generate version-create.mongo file and install it
by Xenofon Karamanos 03 Feb '25

03 Feb '25

Module: kamailio Branch: master Commit: b70ade3e636cec8c38f40c92ec6bab5e7486feee URL: https://github.com/kamailio/kamailio/commit/b70ade3e636cec8c38f40c92ec6bab5… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-02-03T08:56:59Z cmake: Generate version-create.mongo file and install it --- Added: utils/kamctl/generate_version_create_mongo.sh Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/b70ade3e636cec8c38f40c92ec6bab5… Patch: https://github.com/kamailio/kamailio/commit/b70ade3e636cec8c38f40c92ec6bab5… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index ca8a4f20660..ad7ef141090 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -306,11 +306,11 @@ else() COMMENT "Cleaning ${db_name} schema files") endfunction() - # Add targets for each database type Pi framework targets should combined into - # one + # Add targets for each database type add_custom_target(dbschema COMMENT "Generating schemas for all dbs...") add_custom_target(dbschema_clean COMMENT "Cleaning schemas for all dbs...") + # Pi framework targets should combined into one if("xhttp_pi" IN_LIST FINAL_MODULES_LIST) add_db_target(pi_framework_table "${STYLESHEETS}/pi_framework_table.xsl") add_db_target(pi_framework_mod "${STYLESHEETS}/pi_framework_mod.xsl") @@ -361,6 +361,24 @@ else() add_db_target(mongodb "${STYLESHEETS}/mongodb.xsl") add_dependencies(dbschema dbschema_mongodb) add_dependencies(dbschema_clean dbschema_mongodb_clean) + # Create the version-create.mongo script + # After processing the JSON files, create the version-create.mongo script + # Usage of generate_version_create_mongo.sh: + # 1. The first argument is the path to create the version-create.mongo script + # 2. The second argument is the path to the directory containing the JSON files + add_custom_command( + TARGET dbschema_mongodb + POST_BUILD + COMMAND + bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_version_create_mongo.sh + "${CMAKE_CURRENT_BINARY_DIR}/mongodb/kamailio/version-create.mongo" + "${CMAKE_CURRENT_BINARY_DIR}/mongodb/kamailio" + COMMENT "Creating version-create.mongo from JSON files") + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/mongodb/kamailio/version-create.mongo + DESTINATION ${CMAKE_INSTALL_DATADIR}/${MAIN_NAME}/mongodb/${MAIN_NAME} + COMPONENT KMONGODB) endif() if("db_redis" IN_LIST FINAL_MODULES_LIST) add_db_target(db_redis "${STYLESHEETS}/db_redis.xsl") diff --git a/utils/kamctl/generate_version_create_mongo.sh b/utils/kamctl/generate_version_create_mongo.sh new file mode 100644 index 00000000000..47048cc0962 --- /dev/null +++ b/utils/kamctl/generate_version_create_mongo.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +OUTPUT_FILE="$1" +JSON_DIR="$2" + +# Create the version-create.mongo file +echo "use kamailio;" > "$OUTPUT_FILE" +echo "db.createCollection(\"version\");" >> "$OUTPUT_FILE" + +for FILE in "$JSON_DIR"/*.json; do + if [ -f "$FILE" ]; then + if [ "$FILE" != "$JSON_DIR/version.json" ]; then + VN=$(grep '"version":' "$FILE" | grep -o -E '[0-9]+') + FN=$(basename "$FILE" .json) + echo "db.getCollection(\"version\").insert({ table_name: \"$FN\", table_version: NumberInt($VN) });" >> "$OUTPUT_FILE" + fi + fi +done \ No newline at end of file

1 0

git:master:e5f90cfc: dialog: use ksr_time_uint() for getting unsigned int time values
by Daniel-Constantin Mierla 02 Feb '25

02 Feb '25

Module: kamailio Branch: master Commit: e5f90cfce9d3ce13eada38cd1e058824d56b99df URL: https://github.com/kamailio/kamailio/commit/e5f90cfce9d3ce13eada38cd1e05882… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-02T17:10:37+01:00 dialog: use ksr_time_uint() for getting unsigned int time values --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c Modified: src/modules/dialog/dlg_dmq.c Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/e5f90cfce9d3ce13eada38cd1e05882… Patch: https://github.com/kamailio/kamailio/commit/e5f90cfce9d3ce13eada38cd1e05882… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 6e6bd93aabf..6871cc960e3 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -3323,8 +3323,8 @@ static void rpc_dlg_set_state(rpc_t *rpc, void *c) /* updates for terminated dialogs */ if(ostate == DLG_STATE_CONFIRMED && sval == DLG_STATE_DELETED) { /* updating timestamps, flags, dialog stats */ - dlg->init_ts = (unsigned int)(time(0)); - dlg->end_ts = (unsigned int)(time(0)); + dlg->init_ts = ksr_time_uint(NULL, NULL); + dlg->end_ts = ksr_time_uint(NULL, NULL); } dlg->dflags |= DLG_FLAG_CHANGED; diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 18ecdcaa6c9..0f18be6e81d 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -437,13 +437,13 @@ int load_dialog_info_from_db( dlg->tl.timeout = (unsigned int)(VAL_INT(values + 9)); LM_DBG("db dialog timeout is %u (%u/%u)\n", dlg->tl.timeout, - get_ticks(), (unsigned int)time(0)); - if(dlg->tl.timeout <= (unsigned int)time(0)) { + get_ticks(), ksr_time_uint(NULL, NULL)); + if(dlg->tl.timeout <= ksr_time_uint(NULL, NULL)) { dlg->tl.timeout = 0; dlg->lifetime = 0; } else { dlg->lifetime = dlg->tl.timeout - dlg->start_ts; - dlg->tl.timeout -= (unsigned int)time(0); + dlg->tl.timeout -= ksr_time_uint(NULL, NULL); } GET_STR_VALUE(cseq1, values, 10, 1, 1); @@ -492,7 +492,7 @@ int load_dialog_info_from_db( if(dlg->state == DLG_STATE_DELETED) { /* end_ts used for force clean up not stored - set it to now */ - dlg->end_ts = (unsigned int)time(0); + dlg->end_ts = ksr_time_uint(NULL, NULL); } /*restore the timer values */ if(0 != insert_dlg_timer(&(dlg->tl), (int)dlg->tl.timeout)) { @@ -898,7 +898,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell *cell) VAL_INT(values + 1) = cell->h_id; VAL_INT(values + 9) = cell->start_ts; VAL_INT(values + 10) = cell->state; - VAL_INT(values + 11) = (unsigned int)((unsigned int)time(0) + VAL_INT(values + 11) = (unsigned int)(ksr_time_uint(NULL, NULL) + cell->tl.timeout - get_ticks()); SET_STR_VALUE(values + 2, cell->callid); @@ -980,7 +980,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell *cell) VAL_INT(values) = cell->h_entry; VAL_INT(values + 1) = cell->h_id; VAL_INT(values + 10) = cell->state; - VAL_INT(values + 11) = (unsigned int)((unsigned int)time(0) + VAL_INT(values + 11) = (unsigned int)(ksr_time_uint(NULL, NULL) + cell->tl.timeout - get_ticks()); SET_STR_VALUE(values + 12, cell->cseq[DLG_CALLER_LEG]); diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index bb8a69cffd6..6cd8d898762 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -349,7 +349,7 @@ int dlg_dmq_handle_msg( dlg->dflags |= DLG_FLAG_NEW; /* keep dialog around for a bit, to prevent out-of-order * syncs to reestablish the dlg */ - dlg->init_ts = time(NULL); + dlg->init_ts = ksr_time_uint(NULL, NULL); break; default: LM_ERR("unhandled state update to state %u\n", state); diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index a37adee49d2..58b0311bece 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -225,7 +225,7 @@ int dlg_clean_run(ticks_t ti) dlg_cell_t *dlg; dlg_cell_t *tdlg; - tm = (unsigned int)time(NULL); + tm = ksr_time_uint(NULL, NULL); for(i = 0; i < d_table->size; i++) { dlg_lock(d_table, &d_table->entries[i]); dlg = d_table->entries[i].first; @@ -474,7 +474,7 @@ struct dlg_cell *build_new_dlg( memset(dlg, 0, len); dlg->state = DLG_STATE_UNCONFIRMED; - dlg->init_ts = (unsigned int)time(NULL); + dlg->init_ts = ksr_time_uint(NULL, NULL); dlg->h_entry = core_hash(callid, 0, d_table->size); LM_DBG("new dialog on hash %u\n", dlg->h_entry);

1 0

git:master:7a73e08b: msrp: variable for extra headers used in local replies
by Daniel-Constantin Mierla 01 Feb '25

01 Feb '25

Module: kamailio Branch: master Commit: 7a73e08b0e5b4c3fbeb4f097c1f891d06c74651d URL: https://github.com/kamailio/kamailio/commit/7a73e08b0e5b4c3fbeb4f097c1f891d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-01T07:40:11+01:00 msrp: variable for extra headers used in local replies --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/7a73e08b0e5b4c3fbeb4f097c1f891d… Patch: https://github.com/kamailio/kamailio/commit/7a73e08b0e5b4c3fbeb4f097c1f891d… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index a1e79e84447..e1a378ee7ac 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -156,6 +156,7 @@ int msrp_cmap_save(msrp_frame_t *mf) char sbuf[MSRP_SBUF_SIZE]; str srcaddr; str srcsock; + str xhdrs; int msize; int expires; msrp_citem_t *it; @@ -172,16 +173,18 @@ int msrp_cmap_save(msrp_frame_t *mf) expires = msrp_auth_max_expires; if(expires < msrp_auth_min_expires) { LM_DBG("expires is lower than min value\n"); - srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Min-Expires: %d\r\n", + xhdrs.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Min-Expires: %d\r\n", msrp_auth_min_expires); - msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &srcaddr); + xhdrs.s = sbuf; + msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs); return -3; } if(expires > msrp_auth_max_expires) { LM_DBG("expires is greater than max value\n"); - srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Max-Expires: %d\r\n", + xhdrs.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Max-Expires: %d\r\n", msrp_auth_max_expires); - msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &srcaddr); + msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs); + xhdrs.s = sbuf; return -4; } if(msrp_frame_get_first_from_path(mf, &fpeer) < 0) {

1 0

git:master:833bb437: dialog: use internal function to get 4-byte time value
by Daniel-Constantin Mierla 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 833bb437750ee3c9403f91eb13a607ceede0be5d URL: https://github.com/kamailio/kamailio/commit/833bb437750ee3c9403f91eb13a607c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-31T20:23:11+01:00 dialog: use internal function to get 4-byte time value --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/833bb437750ee3c9403f91eb13a607c… Patch: https://github.com/kamailio/kamailio/commit/833bb437750ee3c9403f91eb13a607c… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index c05da0378fb..822175eb829 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -494,7 +494,7 @@ static void dlg_onreply(struct cell *t, int type, struct tmcb_params *param) next_state_dlg(dlg, event, &old_state, &new_state, &unref); if(new_state == DLG_STATE_DELETED && old_state != DLG_STATE_DELETED) { /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); + dlg->end_ts = ksr_time_uint(NULL, NULL); } if(dlg_run_event_route( dlg, (rpl == FAKED_REPLY) ? NULL : rpl, old_state, new_state) @@ -540,7 +540,7 @@ static void dlg_onreply(struct cell *t, int type, struct tmcb_params *param) } /* set start time */ - dlg->start_ts = (unsigned int)(time(0)); + dlg->start_ts = ksr_time_uint(NULL, NULL); /* save the settings to the database, * if realtime saving mode configured- save dialog now @@ -1431,7 +1431,7 @@ void dlg_onroute(struct sip_msg *req, str *route_params, void *param) next_state_dlg(dlg, event, &old_state, &new_state, &unref); CURR_DLG_ID = req->id; - CURR_DLG_LIFETIME = (unsigned int)(time(0)) - dlg->start_ts; + CURR_DLG_LIFETIME = ksr_time_uint(NULL, NULL) - dlg->start_ts; CURR_DLG_STATUS = new_state; if(dlg_run_event_route(dlg, req, old_state, new_state) < 0) { @@ -1443,7 +1443,7 @@ void dlg_onroute(struct sip_msg *req, str *route_params, void *param) * to absorb in-air messages */ if(new_state == DLG_STATE_DELETED && old_state != DLG_STATE_DELETED) { /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); + dlg->end_ts = ksr_time_uint(NULL, NULL); iuid = dlg_get_iuid_shm_clone(dlg); if(iuid != NULL) { if(d_tmb.register_tmcb(req, NULL, TMCB_DESTROY, unref_dlg_from_cb, @@ -1681,7 +1681,7 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg->tag[DLG_CALLEE_LEG].s, old_state); /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); + dlg->end_ts = ksr_time_uint(NULL, NULL); /* dialog timeout */ run_dlg_callbacks( @@ -1923,8 +1923,8 @@ int dlg_set_state(sip_msg_t *msg, int istate) /* updates for terminated dialogs */ if(ostate == DLG_STATE_CONFIRMED && istate == DLG_STATE_DELETED) { /* updating timestamps, flags, dialog stats */ - dlg->init_ts = (unsigned int)(time(0)); - dlg->end_ts = (unsigned int)(time(0)); + dlg->init_ts = ksr_time_uint(NULL, NULL); + dlg->end_ts = ksr_time_uint(NULL, NULL); } dlg->dflags |= DLG_FLAG_CHANGED; dlg_release(dlg);

1 0

git:master:5283bf62: core: ut.h - function to split time_t in lower and upper 4 bytes
by Daniel-Constantin Mierla 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 5283bf6288a6b86bdc405883d6995f03cc373256 URL: https://github.com/kamailio/kamailio/commit/5283bf6288a6b86bdc405883d6995f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-31T20:23:11+01:00 core: ut.h - function to split time_t in lower and upper 4 bytes - lower 4 bytes are returned, upper 4 bytes can be stored in output parameter - if pointer to time value is not give, time(0) is used --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/5283bf6288a6b86bdc405883d6995f0… Patch: https://github.com/kamailio/kamailio/commit/5283bf6288a6b86bdc405883d6995f0… --- diff --git a/src/core/ut.h b/src/core/ut.h index 31b45fe5b4d..29faca83fc2 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1155,6 +1155,27 @@ static inline int strno2int(str *val, unsigned int *mask) } } +static inline unsigned int ksr_time_uint(time_t *tv, unsigned int *tu) +{ + unsigned int tl; /* lower 4 bytes */ + unsigned long long v64; + time_t t; + + if(tv != NULL) { + t = *tv; + } else { + t = time(NULL); + } + v64 = (unsigned long long)t; + tl = (unsigned int)(v64 & 0xFFFFFFFFULL); + if(tu != NULL) { + /* upper 4 bytes */ + *tu = (unsigned int)((v64 >> 32) & 0xFFFFFFFFULL); + } + + return tl; +} + /* converts a username into uid:gid, * returns -1 on error & 0 on success */ int user2uid(int *uid, int *gid, char *user);

1 0

git:master:478310c5: pv: small reworking of pointer conditions
by Daniel-Constantin Mierla 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 478310c56f0eb060c5f31b2ee8febbb6204d37e7 URL: https://github.com/kamailio/kamailio/commit/478310c56f0eb060c5f31b2ee8febbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-31T20:23:11+01:00 pv: small reworking of pointer conditions --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/478310c56f0eb060c5f31b2ee8febbb… Patch: https://github.com/kamailio/kamailio/commit/478310c56f0eb060c5f31b2ee8febbb… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 3963ead97f9..38d46c01dba 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3654,7 +3654,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, } buf.s = pkg_malloc(val->rs.len); - if(buf.s == 0) { + if(buf.s == NULL) { LM_ERR("no more pkg mem\n"); goto error; } @@ -3681,7 +3681,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return -1; } buf.s = pkg_malloc(val->rs.len + 1); - if(buf.s == 0) { + if(buf.s == NULL) { LM_ERR("no more pkg mem\n"); goto error; } @@ -3708,7 +3708,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return -1; } buf.s = pkg_malloc(val->rs.len); - if(buf.s == 0) { + if(buf.s == NULL) { PKG_MEM_ERROR; goto error; } @@ -3735,7 +3735,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return -1; } buf.s = pkg_malloc(val->rs.len + 1); - if(buf.s == 0) { + if(buf.s == NULL) { LM_ERR("no more pkg mem\n"); goto error; } @@ -3790,7 +3790,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, goto error; } } else { - if(buf.s != 0) { + if(buf.s != NULL) { pkg_free(buf.s); buf.s = NULL; } @@ -3817,8 +3817,9 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return 0; error: - if(buf.s != 0) + if(buf.s != NULL) { pkg_free(buf.s); + } return -1; }

1 0

[kamailio/kamailio] pkg/kamailio/alpine: Add new modules (PR #4132)
by Ben Kaufman 31 Jan '25

31 Jan '25

- Add missing modules to alpine packages as listed in GH #4131   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #4131 Changes should be backported to 6.0 branch, not 5.8 branch since it contains modules that don't exist in 5.8 #### Description Update `/pkg/kamailio/alpine/APKBUILD` file to add modules that have been added to Kamailio in the last few years. This also includes updating the dependency list for the modules. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4132 -- Commit Summary -- * pkg/kamailio/alpine: Add new modules -- File Changes -- M pkg/kamailio/alpine/APKBUILD (146) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4132.patch https://github.com/kamailio/kamailio/pull/4132.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4132 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4132(a)github.com>

2 3

Kamailio 6.0 presentation at FOSDEM 2025
by Henning Westerholt 31 Jan '25

31 Jan '25

Hello, just a quick announcement, that tomorrow afternoon will be a presentation about Kamailio 6.0 at the FOSDEM conference in Brussels, Belgium [1]. Usually all the talks in this room are streamed online as well. I am happy also to meet during the conference to chat about Kamailio or other topics, just send me a (direct) message. Best regards, Henning [1] https://fosdem.org/2025/schedule/event/fosdem-2025-5978-kamailio-6-0-develo… -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

[kamailio/kamailio] db_oracle: fix db_oracle cmake build for oracle 18.3.0.0.0 (PR #4128)
by Ovidiu Sas 31 Jan '25

31 Jan '25

This pull request enables db_oracle to be built against oracle 18.3.0.0.0 dev libraries using cmake. It requires the following env variables to be set: ``` declare -x ORACLE_HOME="/usr/lib/oracle/18.3/client64/" declare -x ORACLE_INCLUDE_DIR="/usr/include/oracle/18.3/client64" ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4128 -- Commit Summary -- * db_oracle: fix db_oracle build for oracle 18.3.0.0.0 -- File Changes -- M cmake/modules/FindOracle.cmake (3) M src/modules/db_oracle/CMakeLists.txt (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4128.patch https://github.com/kamailio/kamailio/pull/4128.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4128 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4128(a)github.com>

3 2

git:master:77ce71fc: db_oracle: fix db_oracle build for oracle 18.3.0.0.0
by Victor Seva 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 77ce71fcd4cfb6f0f86313d95341e4abd0031b2c URL: https://github.com/kamailio/kamailio/commit/77ce71fcd4cfb6f0f86313d95341e4a… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-31T12:55:48+01:00 db_oracle: fix db_oracle build for oracle 18.3.0.0.0 --- Modified: cmake/modules/FindOracle.cmake Modified: src/modules/db_oracle/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/77ce71fcd4cfb6f0f86313d95341e4a… Patch: https://github.com/kamailio/kamailio/commit/77ce71fcd4cfb6f0f86313d95341e4a… --- diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake index bc6f64a9bd5..1b88fe4ee04 100644 --- a/cmake/modules/FindOracle.cmake +++ b/cmake/modules/FindOracle.cmake @@ -29,6 +29,9 @@ if(NOT ORACLE_HOME) if(EXISTS $ENV{ORACLE_HOME}) set(ORACLE_HOME $ENV{ORACLE_HOME}) endif() + if(EXISTS $ENV{ORACLE_INCLUDE_DIR}) + set(ORACLE_INCLUDE_DIR $ENV{ORACLE_INCLUDE_DIR}) + endif() endif() message(STATUS "ORACLE_HOME=${ORACLE_HOME}") diff --git a/src/modules/db_oracle/CMakeLists.txt b/src/modules/db_oracle/CMakeLists.txt index 758e78e8b25..66a4ab5ebea 100644 --- a/src/modules/db_oracle/CMakeLists.txt +++ b/src/modules/db_oracle/CMakeLists.txt @@ -6,5 +6,5 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) find_package(Oracle REQUIRED) # /usr/include/oracle/18.3/client64) -target_include_directories(${module_name} PRIVATE ${Oracle_INCLUDE_DIRS}) -target_link_libraries(${module_name} PRIVATE occi clntsh) +target_include_directories(${module_name} PRIVATE ${ORACLE_INCLUDE_DIR}) +target_link_libraries(${module_name} PRIVATE ${ORACLE_LIBRARIES})

1 0

git:master:f07d8ea5: pkg/kamailio/alpine: Add new modules
by Victor Seva 30 Jan '25

30 Jan '25

Module: kamailio Branch: master Commit: f07d8ea527883009fece7fd2a1c61d0a90a0c660 URL: https://github.com/kamailio/kamailio/commit/f07d8ea527883009fece7fd2a1c61d0… Author: Kaufman <bkaufman(a)bcmone.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-30T22:32:16+01:00 pkg/kamailio/alpine: Add new modules - Add missing modules to alpine packages as listed in GH #4131 --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/f07d8ea527883009fece7fd2a1c61d0… Patch: https://github.com/kamailio/kamailio/commit/f07d8ea527883009fece7fd2a1c61d0…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev