ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenVidu/openvidu

pull/447/head
OscarSotoSanchez 2020-04-21 13:44:53 +02:00
parent 644e004fc0 c2198b5d01
commit bee2ad0de6
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openvidu-server/docker/openvidu-coturn/discover_my_public_ip.sh
View File

@ -9,7 +9,7 @@ function valid_ip()
if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
OIFS=$IFS OIFS=$IFS
IFS='.' IFS='.'
ip=($ip) ip=("$ip")
IFS=$OIFS IFS=$OIFS
[[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
&& ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
@ -20,23 +20,24 @@ function valid_ip()
# Services to get public ip # Services to get public ip
SERVICES=( SERVICES=(
"curl --silent -sw :%{http_code} ipv4.icanhazip.com"
"curl --silent -sw :%{http_code} ifconfig.me" "curl --silent -sw :%{http_code} ifconfig.me"
"curl --silent -sw :%{http_code} -4 ifconfig.co"
"curl --silent -sw :%{http_code} ipecho.net/plain" "curl --silent -sw :%{http_code} ipecho.net/plain"
"curl --silent -sw :%{http_code} ipinfo.io/ip" "curl --silent -sw :%{http_code} ipinfo.io/ip"
"curl --silent -sw :%{http_code} checkip.amazonaws.com" "curl --silent -sw :%{http_code} checkip.amazonaws.com"
"curl --silent -sw :%{http_code} ident.me" "curl --silent -sw :%{http_code} v4.ident.me"
"curl --silent -sw :%{http_code} icanhazip.com"
) )
# Get public ip # Get public ip
for service in "${SERVICES[@]}"; do for service in "${SERVICES[@]}"; do
RUN_COMMAND=$($service | tr -d '[:space:]') RUN_COMMAND=$($service | tr -d '[:space:]')
IP=$(echo $RUN_COMMAND | cut -d':' -f1) IP=$(echo "$RUN_COMMAND" | cut -d':' -f1)
HTTP_CODE=$(echo $RUN_COMMAND | cut -d':' -f2) HTTP_CODE=$(echo "$RUN_COMMAND" | cut -d':' -f2)
if [ "$HTTP_CODE" == "200" ]; then if [ "$HTTP_CODE" == "200" ]; then
if valid_ip "$IP"; then if valid_ip "$IP"; then
printf "$IP" printf "%s" "$IP"
exit 0 exit 0
fi fi
fi fi

13
openvidu-server/docker/openvidu-server-pro/discover_my_public_ip.sh
View File

@ -9,7 +9,7 @@ function valid_ip()
if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
OIFS=$IFS OIFS=$IFS
IFS='.' IFS='.'
ip=($ip) ip=("$ip")
IFS=$OIFS IFS=$OIFS
[[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
&& ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
@ -20,23 +20,24 @@ function valid_ip()
# Services to get public ip # Services to get public ip
SERVICES=( SERVICES=(
"curl --silent -sw :%{http_code} ipv4.icanhazip.com"
"curl --silent -sw :%{http_code} ifconfig.me" "curl --silent -sw :%{http_code} ifconfig.me"
"curl --silent -sw :%{http_code} -4 ifconfig.co"
"curl --silent -sw :%{http_code} ipecho.net/plain" "curl --silent -sw :%{http_code} ipecho.net/plain"
"curl --silent -sw :%{http_code} ipinfo.io/ip" "curl --silent -sw :%{http_code} ipinfo.io/ip"
"curl --silent -sw :%{http_code} checkip.amazonaws.com" "curl --silent -sw :%{http_code} checkip.amazonaws.com"
"curl --silent -sw :%{http_code} ident.me" "curl --silent -sw :%{http_code} v4.ident.me"
"curl --silent -sw :%{http_code} icanhazip.com"
) )
# Get public ip # Get public ip
for service in "${SERVICES[@]}"; do for service in "${SERVICES[@]}"; do
RUN_COMMAND=$($service | tr -d '[:space:]') RUN_COMMAND=$($service | tr -d '[:space:]')
IP=$(echo $RUN_COMMAND | cut -d':' -f1) IP=$(echo "$RUN_COMMAND" | cut -d':' -f1)
HTTP_CODE=$(echo $RUN_COMMAND | cut -d':' -f2) HTTP_CODE=$(echo "$RUN_COMMAND" | cut -d':' -f2)
if [ "$HTTP_CODE" == "200" ]; then if [ "$HTTP_CODE" == "200" ]; then
if valid_ip "$IP"; then if valid_ip "$IP"; then
printf "$IP" printf "%s" "$IP"
exit 0 exit 0
fi fi
fi fi

13
openvidu-server/docker/openvidu-server/discover_my_public_ip.sh
View File

@ -9,7 +9,7 @@ function valid_ip()
if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
OIFS=$IFS OIFS=$IFS
IFS='.' IFS='.'
ip=($ip) ip=("$ip")
IFS=$OIFS IFS=$OIFS
[[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
&& ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
@ -20,23 +20,24 @@ function valid_ip()
# Services to get public ip # Services to get public ip
SERVICES=( SERVICES=(
"curl --silent -sw :%{http_code} ipv4.icanhazip.com"
"curl --silent -sw :%{http_code} ifconfig.me" "curl --silent -sw :%{http_code} ifconfig.me"
"curl --silent -sw :%{http_code} -4 ifconfig.co"
"curl --silent -sw :%{http_code} ipecho.net/plain" "curl --silent -sw :%{http_code} ipecho.net/plain"
"curl --silent -sw :%{http_code} ipinfo.io/ip" "curl --silent -sw :%{http_code} ipinfo.io/ip"
"curl --silent -sw :%{http_code} checkip.amazonaws.com" "curl --silent -sw :%{http_code} checkip.amazonaws.com"
"curl --silent -sw :%{http_code} ident.me" "curl --silent -sw :%{http_code} v4.ident.me"
"curl --silent -sw :%{http_code} icanhazip.com"
) )
# Get public ip # Get public ip
for service in "${SERVICES[@]}"; do for service in "${SERVICES[@]}"; do
RUN_COMMAND=$($service | tr -d '[:space:]') RUN_COMMAND=$($service | tr -d '[:space:]')
IP=$(echo $RUN_COMMAND | cut -d':' -f1) IP=$(echo "$RUN_COMMAND" | cut -d':' -f1)
HTTP_CODE=$(echo $RUN_COMMAND | cut -d':' -f2) HTTP_CODE=$(echo "$RUN_COMMAND" | cut -d':' -f2)
if [ "$HTTP_CODE" == "200" ]; then if [ "$HTTP_CODE" == "200" ]; then
if valid_ip "$IP"; then if valid_ip "$IP"; then
printf "$IP" printf "%s" "$IP"
exit 0 exit 0
fi fi
fi fi