From 9f5a7b2ff2acf47ef0acffdb99861604fc02608e Mon Sep 17 00:00:00 2001 From: George Joseph Date: Thu, 17 Jul 2025 15:18:50 -0600 Subject: [PATCH] cdr.c: Set tenantid from party_a->base instead of chan->base. The CDR tenantid was being set in cdr_object_alloc from the channel->base snapshot. Since this happens at channel creation before the dialplan is even reached, calls to `CHANNEL(tenantid)=` in the dialplan were being ignored. Instead we now take tenantid from party_a when cdr_object_create_public_records() is called which is after the call has ended and all channel snapshots rebuilt. This is exactly how accountcode and amaflags, which can also be set in tha dialplpan, are handled. Resolves: #1259 (cherry picked from commit 84edf7d44bf4b18ddeccfb905443b3224090d89e) --- main/cdr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main/cdr.c b/main/cdr.c index 605e4558a8..e4018fbd10 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1149,7 +1149,6 @@ static struct cdr_object *cdr_object_alloc(struct ast_channel_snapshot *chan, co ast_string_field_set(cdr, uniqueid, chan->base->uniqueid); ast_string_field_set(cdr, name, chan->base->name); ast_string_field_set(cdr, linkedid, chan->peer->linkedid); - ast_string_field_set(cdr, tenantid, chan->base->tenantid); cdr->disposition = AST_CDR_NULL; cdr->sequence = ast_atomic_fetchadd_int(&global_cdr_sequence, +1); cdr->lastevent = *event_time; @@ -1418,7 +1417,7 @@ static struct ast_cdr *cdr_object_create_public_records(struct cdr_object *cdr) ast_copy_string(cdr_copy->lastdata, it_cdr->data, sizeof(cdr_copy->lastdata)); ast_copy_string(cdr_copy->dst, it_cdr->exten, sizeof(cdr_copy->dst)); ast_copy_string(cdr_copy->dcontext, it_cdr->context, sizeof(cdr_copy->dcontext)); - ast_copy_string(cdr_copy->tenantid, it_cdr->tenantid, sizeof(cdr_copy->tenantid)); + ast_copy_string(cdr_copy->tenantid, party_a->base->tenantid, sizeof(cdr_copy->tenantid)); /* Party B */ if (party_b) { -- 2.47.3