kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

app_queue: Add option to not log Restricted Caller ID to queue_log

Browse Source 
Add a queue option log-restricted-caller-id to strip the Caller ID when storing the ENTERQUEUE event
in the queue log if the Caller ID is restricted.

Resolves: #765

UpgradeNote: Add a new column to the queues table:
queue_log_option_log_restricted ENUM('0','1','off','on','false','true','no','yes')
to control whether the Restricted Caller ID will be stored in the queue log.

UserNote: Add a Queue option log-restricted-caller-id to control whether the Restricted Caller ID
will be stored in the queue log.
If log-restricted-caller-id=no then the Caller ID will be stripped if the Caller ID is restricted.
This commit is contained in:
Alexei Gradinari
2024-06-12 17:18:05 -04:00
parent dcdda4688e
commit 624c23310e
3 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_queue.c
View File

@@ -1900,6 +1900,8 @@ struct call_queue {
int memberdelay; /*!< Seconds to delay connecting member to caller */
int autofill; /*!< Ignore the head call status and ring an available agent */
int log_restricted_caller_id:1; /*!< Whether log Restricted Caller ID */
struct ao2_container *members; /*!< Head of the list of members */
struct queue_ent *head; /*!< Head of the list of callers */
AST_LIST_ENTRY(call_queue) list; /*!< Next call queue */
@@ -3012,6 +3014,7 @@ static void init_queue(struct call_queue *q)
q->autopauseunavail = 0;
q->timeoutpriority = TIMEOUT_PRIORITY_APP;
q->autopausedelay = 0;
q->log_restricted_caller_id = 1;
if (!q->members) {
if (q->strategy == QUEUE_STRATEGY_LINEAR || q->strategy == QUEUE_STRATEGY_RRORDERED) {
/* linear strategy depends on order, so we have to place all members in a list */
@@ -3543,6 +3546,8 @@ static void queue_set_param(struct call_queue *q, const char *param, const char
} else {
q->timeoutpriority = TIMEOUT_PRIORITY_APP;
}
} else if (!strcasecmp(param, "log-restricted-caller-id")) {
q->log_restricted_caller_id = ast_true(val);
} else if (failunknown) {
if (linenum >= 0) {
ast_log(LOG_WARNING, "Unknown keyword in queue '%s': %s at line %d of queues.conf\n",
@@ -8628,6 +8633,7 @@ static int queue_exec(struct ast_channel *chan, const char *data)
struct ast_flags opts = { 0, };
char *opt_args[OPT_ARG_ARRAY_SIZE];
int max_forwards;
int cid_allow;
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "Queue requires an argument: queuename[,options[,URL[,announceoverride[,timeout[,agi[,macro[,gosub[,rule[,position]]]]]]]]]\n");
@@ -8774,9 +8780,11 @@ static int queue_exec(struct ast_channel *chan, const char *data)
qe.last_periodic_announce_time -= qe.parent->periodicannouncefrequency;
}
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(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, ""),
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. */