yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-23 09:55:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5113 from paul-elliott-arm/ssl_opt_fixes_2.x

Browse source 
Backport 2.x : Ssl opt fixes
This commit is contained in:
Gilles Peskine 2021-10-26 20:50:50 +02:00 committed by GitHub
parent 05ee09eae7 ce77738d95
commit db77eaf2b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/ssl-opt.sh
View file

@ -559,6 +559,8 @@ has_mem_err() {
# Wait for process $2 named $3 to be listening on port $1. Print error to $4. # Wait for process $2 named $3 to be listening on port $1. Print error to $4.
if type lsof >/dev/null 2>/dev/null; then if type lsof >/dev/null 2>/dev/null; then
wait_app_start() { wait_app_start() {
newline='
'
START_TIME=$(date +%s) START_TIME=$(date +%s)
if [ "$DTLS" -eq 1 ]; then if [ "$DTLS" -eq 1 ]; then
proto=UDP proto=UDP
@ -566,7 +568,15 @@ if type lsof >/dev/null 2>/dev/null; then
proto=TCP proto=TCP
fi fi
# Make a tight loop, server normally takes less than 1s to start. # Make a tight loop, server normally takes less than 1s to start.
while ! lsof -a -n -b -i "$proto:$1" -p "$2" >/dev/null 2>/dev/null; do while true; do
SERVER_PIDS=$(lsof -a -n -b -i "$proto:$1" -F p)
# When we use a proxy, it will be listening on the same port we
# are checking for as well as the server and lsof will list both.
# If multiple PIDs are returned, each one will be on a separate
# line, each prepended with 'p'.
case ${newline}${SERVER_PIDS}${newline} in
*${newline}p${2}${newline}*) break;;
esac
if [ $(( $(date +%s) - $START_TIME )) -gt $DOG_DELAY ]; then if [ $(( $(date +%s) - $START_TIME )) -gt $DOG_DELAY ]; then
echo "$3 START TIMEOUT" echo "$3 START TIMEOUT"
echo "$3 START TIMEOUT" >> $4 echo "$3 START TIMEOUT" >> $4