diff options
| author | Sergej Kasumovic <sergej@bicomsystems.com> | 2017-07-14 08:25:36 +0200 |
|---|---|---|
| committer | Sergej Kasumovic <sergej@bicomsystems.com> | 2017-07-14 07:48:58 -0500 |
| commit | 86c585bf19488c0a7e91dcd063c9cc8916e3db76 (patch) | |
| tree | ce2b61b18724381a2817ba2d58a806f601aa4a00 /apps | |
| parent | 70672ef1125f85da2c1ad6072c1f348584fff5b6 (diff) | |
app_confbridge: Make sure name recordings are always removed from the filesystem
This commit fixes two possible scenarios:
* When recording name and if during recording you hangup, file is never
removed. This is due to the fact file location is nulled.
* When recording name and if you hangup during thank-you prompt, file
is never removed.
ASTERISK-27123 #close
Change-Id: I39b7271408b4b54ce880c5111a886aa8f28c2625
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_confbridge.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index e2a35ff31..a33622f11 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -2140,6 +2140,7 @@ static int conf_rec_name(struct confbridge_user *user, const char *conf_name) } if (res == -1) { + ast_filedelete(user->name_rec_location, NULL); user->name_rec_location[0] = '\0'; return -1; } @@ -2231,6 +2232,7 @@ static int confbridge_exec(struct ast_channel *chan, const char *data) { int res = 0, volume_adjustments[2]; int quiet = 0; + int async_delete_task_pushed = 0; char *parse; const char *b_profile_name = NULL; const char *u_profile_name = NULL; @@ -2476,6 +2478,7 @@ static int confbridge_exec(struct ast_channel *chan, const char *data) async_play_sound_file(conference, conf_get_sound(CONF_SOUND_HAS_LEFT, conference->b_profile.sounds), NULL); async_delete_name_rec(conference, user.name_rec_location); + async_delete_task_pushed = 1; } /* play the leave sound */ @@ -2504,6 +2507,9 @@ static int confbridge_exec(struct ast_channel *chan, const char *data) } confbridge_cleanup: + if (!async_delete_task_pushed && !ast_strlen_zero(user.name_rec_location)) { + ast_filedelete(user.name_rec_location, NULL); + } ast_bridge_features_cleanup(&user.features); conf_bridge_profile_destroy(&user.b_profile); return res; |