-
Notifications
You must be signed in to change notification settings - Fork 259
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Resolves GHSA-98rc-4j27-74hh, GHSA-hxj9-xwr8-w8pq, GHSA-5743-x3p5-3rg7 and GHSA-8857-hfmw-vg8f - patches refreshed - patch 180-app_queue_time_t.patch added to fix new warnings, sent upstream (see [1]) - 180-res_crypto.c-Avoid-using-the-non-portable-ALLPERMS-m.patch and 190-chan_iax2.c-Avoid-crash-with-IAX2-switch-support.patch removed as they're included in upstream release tar ball. [1] asterisk/asterisk#516 Signed-off-by: Sebastian Kemper <[email protected]> (cherry picked from commit 4e4b281)
- Loading branch information
Showing
6 changed files
with
22 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
--- a/apps/app_queue.c | ||
+++ b/apps/app_queue.c | ||
@@ -4614,8 +4614,12 @@ static int is_longest_waiting_caller(str | ||
* will be unused until the first caller is picked up. | ||
*/ | ||
if (ch->start < caller->start && !ch->pending) { | ||
- ast_debug(1, "Queue %s has a call at position %i that's been waiting longer (%li vs %li)\n", | ||
- q->name, ch->pos, ch->start, caller->start); | ||
+ char time1[AST_TIME_T_LEN]; | ||
+ char time2[AST_TIME_T_LEN]; | ||
+ ast_time_t_to_string(ch->start, time1, sizeof(time1)); | ||
+ ast_time_t_to_string(caller->start, time2, sizeof(time2)); | ||
+ ast_debug(1, "Queue %s has a call at position %i that's been waiting longer (%s vs %s)\n", | ||
+ q->name, ch->pos, time1, time2); | ||
is_longest_waiting = 0; | ||
break; | ||
} |
33 changes: 0 additions & 33 deletions
33
net/asterisk/patches/180-res_crypto.c-Avoid-using-the-non-portable-ALLPERMS-m.patch
This file was deleted.
Oops, something went wrong.
25 changes: 0 additions & 25 deletions
25
net/asterisk/patches/190-chan_iax2.c-Avoid-crash-with-IAX2-switch-support.patch
This file was deleted.
Oops, something went wrong.