-
Notifications
You must be signed in to change notification settings - Fork 257
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #850 from micmac1/23.05-ast-20.5.2
[23.05] asterisk + pjproject: bump for security
- Loading branch information
Showing
9 changed files
with
60 additions
and
65 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
26 changes: 26 additions & 0 deletions
26
libs/pjproject/patches/0020-log-dropped-packet-in-debug.patch
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,26 @@ | ||
--- a/pjsip/src/pjsip/sip_transport.c | ||
+++ b/pjsip/src/pjsip/sip_transport.c | ||
@@ -2088,15 +2088,17 @@ PJ_DEF(pj_ssize_t) pjsip_tpmgr_receive_p | ||
* which were sent to keep NAT bindings. | ||
*/ | ||
if (tmp.slen) { | ||
- PJ_LOG(1, (THIS_FILE, | ||
- "Error processing %d bytes packet from %s %s:%d %.*s:\n" | ||
- "%.*s\n" | ||
- "-- end of packet.", | ||
+ PJ_LOG(2, (THIS_FILE, | ||
+ "Dropping %d bytes packet from %s %s:%d %.*s\n", | ||
msg_fragment_size, | ||
rdata->tp_info.transport->type_name, | ||
- rdata->pkt_info.src_name, | ||
+ rdata->pkt_info.src_name, | ||
rdata->pkt_info.src_port, | ||
- (int)tmp.slen, tmp.ptr, | ||
+ (int)tmp.slen, tmp.ptr)); | ||
+ PJ_LOG(4, (THIS_FILE, | ||
+ "Dropped packet:" | ||
+ "%.*s\n" | ||
+ "-- end of packet.", | ||
(int)msg_fragment_size, | ||
rdata->msg_info.msg_buf)); | ||
} |
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.