sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chan_dahdi: Don't append cadences on dahdi restart. 

Currently, if any custom ring cadences are specified, they are
appended to the array of cadences from wherever we left off
last time. This works properly the first time, but on subsequent
dahdi restarts, it means that the existing cadences are left
alone and (most likely) the same cadences are then re-added
afterwards. In short order, the cadence array gets maxed out
and the user begins seeing warnings that the array is full
and no more cadences may be added.

This buggy behavior persists until Asterisk is completely
restarted; however, if and when dahdi restart is run again,
then the same problem is reintroduced.

This fixes this behavior so that cadence parsing is more
idempotent, that is so running dahdi restart multiple times
starts adding cadences from the beginning, rather than from
wherever the last cadence was added.

As before, it is still not possible to revert to the default
cadences by simply removing all cadences in this manner, nor
is it possible to delete existing cadences. However, this
does make it possible to update existing cadences, which
was not possible before, and also ensures that the cadences
remain unchanged if the config remains unchanged.

ASTERISK-29990 #close

Change-Id: Ie32ea3e8a243b766756b1afce684d4a31ee7421d
This commit is contained in:
Naveen Albert 2022-03-27 11:23:12 +00:00 committed by Joshua Colp
parent 9dc321cbcb
commit cb53ad5671
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
channels/chan_dahdi.c
View File

@ -17873,6 +17873,9 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
int y;
struct ast_variable *dahdichan = NULL;
/* Re-parse any cadences from beginning, rather than appending until we run out of room */
user_has_defined_cadences = 0;
for (; v; v = v->next) {
if (!ast_jb_read_conf(&global_jbconf, v->name, v->value))
continue;

5
configs/samples/chan_dahdi.conf.sample
View File

@ -1286,10 +1286,11 @@ pickupgroup=1
; You can define your own custom ring cadences here. You can define up to 8
; pairs. If the silence is negative, it indicates where the caller ID spill is
; to be placed. Also, if you define any custom cadences, the default cadences
; will be turned off.
; will be turned off (overwritten).
;
; This setting is global, rather than per-channel. It will not update on
; a reload.
; a reload, but new and modified cadences will update on dahdi restart.
; A maximum of 24 cadences may be specified.
;
; Syntax is: cadence=ring,silence[,ring,silence[...]]
;

8
doc/CHANGES-staging/chan_dahdi_cadences.txt Normal file
View File

@ -0,0 +1,8 @@
Subject: chan_dahdi
Previously, cadences were appended on dahdi restart,
rather than reloaded. This prevented cadences from
being updated and maxed out the available cadences
if reloaded multiple times. This behavior is fixed
so that reloading cadences is idempotent and cadences
can actually be reloaded.