From 1855f2a1c0ba8a519f768c676e9c24a21bea168f 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 --- main/cdr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/main/cdr.c b/main/cdr.c index 359d379700..0b1443a483 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1055,7 +1055,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; @@ -1325,7 +1324,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) {