kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add log-caller-id-name option to log Caller ID Name in queue log

Browse Source 
Add log-caller-id-name option to log Caller ID Name in queue log

This patch introduces a new global configuration option, log-caller-id-name,
to queues.conf to control whether the Caller ID name is logged when a call enters a queue.

When log-caller-id-name=yes, the Caller ID name is logged
as parameter 4 in the queue log, provided it’s allowed by the
existing log_restricted_caller_id rules. If log-caller-id-name=no (the default),
the Caller ID name is omitted from the logs.

Fixes: #1091

UserNote: This patch adds a global configuration option, log-caller-id-name, to queues.conf
to control whether the Caller ID name is logged as parameter 4 when a call enters a queue.
When log-caller-id-name=yes, the Caller ID name is included in the queue log,
Any '|' characters in the caller ID name will be replaced with '_'.
(provided it’s allowed by the existing log_restricted_caller_id rules).
When log-caller-id-name=no (the default), the Caller ID name is omitted.

(cherry picked from commit 487584987f)
This commit is contained in:
phoneben
2025-02-28 01:25:50 +02:00
committed by Asterisk Development Team
parent 7b22d2ef88
commit 43db0baf38
2 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/app_queue.c
View File

@@ -1783,6 +1783,9 @@ static int log_membername_as_agent;
/*! \brief queues.conf [general] option */
static int force_longest_waiting_caller;
/*! \brief queues.conf [general] option */
static int log_caller_id_name;
/*! \brief name of the ringinuse field in the realtime database */
static char *realtime_ringinuse_field;
@@ -8871,11 +8874,33 @@ static int queue_exec(struct ast_channel *chan, const char *data)
cid_allow = qe.parent->log_restricted_caller_id || ((ast_party_id_presentation(&ast_channel_caller(chan)->id) & AST_PRES_RESTRICTION) == AST_PRES_ALLOWED);
ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "ENTERQUEUE", "%s|%s|%d",
S_OR(args.url, ""),
S_COR(cid_allow && ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, ""),
qe.opos);
if (log_caller_id_name) {
char *escaped_cidname = NULL;
/* Ensure caller ID name is valid and not NULL before processing */
if (cid_allow && ast_channel_caller(chan)->id.name.valid && ast_channel_caller(chan)->id.name.str) {
escaped_cidname = ast_strdupa(ast_channel_caller(chan)->id.name.str);
/* Only iterate if '|' is found */
if (strchr(escaped_cidname, '|')) {
for (char *p = escaped_cidname; *p; p++) {
if (*p == '|') {
*p = '_';
}
}
}
}
ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "ENTERQUEUE", "%s|%s|%d|%s",
S_OR(args.url, ""),
S_COR(cid_allow && ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, ""),
qe.opos,
S_OR(escaped_cidname, ""));
} else {
ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "ENTERQUEUE", "%s|%s|%d",
S_OR(args.url, ""),
S_COR(cid_allow && ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, ""),
qe.opos);
}
/* PREDIAL: Preprocess any callee gosub arguments. */
if (ast_test_flag(&opts, OPT_PREDIAL_CALLEE)
&& !ast_strlen_zero(opt_args[OPT_ARG_PREDIAL_CALLEE])) {
@@ -9784,6 +9809,10 @@ static void queue_set_global_params(struct ast_config *cfg)
if ((general_val = ast_variable_retrieve(cfg, "general", "force_longest_waiting_caller"))) {
force_longest_waiting_caller = ast_true(general_val);
}
/* Apply log-caller-id-name in the same place as other global settings */
if ((general_val = ast_variable_retrieve(cfg, "general", "log-caller-id-name"))) {
log_caller_id_name = ast_true(general_val);
}
}
/*! \brief reload information pertaining to a single member