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)=<something>` 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 a4aab9d39f87c25381934f176de32718427af9cb)

diff --git a/main/cdr.c b/main/cdr.c
index f7ca3d0ef6e3b35a32dcfa27bd1d54dfbc2dbfd3..d1bc516c16f3c33714d50dd321192d987b6e6dd3 100644 (file)
--- 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) {