EV21/dynb
1
0
Fork 0
mirror of https://github.com/EV21/dynb.git synced 2025-12-26 16:39:32 +01:00
Code Issues Projects Releases Wiki Activity

♻️ refactorings

Browse Source
This commit is contained in:
Eduard Veit
2021-09-12 22:49:40 +02:00
parent eda5a69da2
commit 040aec7472
1 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
dynb.sh
View File

@@ -392,6 +392,11 @@ function getDNSIP() {
function getRemoteIP() { function getRemoteIP() {
curl --silent "$_interface_str" --user-agent "$_userAgent" \ curl --silent "$_interface_str" --user-agent "$_userAgent" \
--ipv"${1}" --dns-servers 1.1.1.1 --location "${2}" --ipv"${1}" --dns-servers 1.1.1.1 --location "${2}"
# shellcheck disable=2181
if [[ $? -gt 0 ]]; then
errorMessage "IPCheck (getRemoteIP ${1}) request failed"
exit 1
fi
} }
# requires parameter # requires parameter
@@ -636,52 +641,40 @@ function checkStatus() {
# requires parameter # requires parameter
# 1. param: 4 or 6 for IP version # 1. param: 4 or 6 for IP version
function ipHasChanged() { function ipHasChanged() {
if [[ ${1} == 4 ]]; then case ${1} in
remote_ip=$(getRemoteIP 4 $_ipv4_checker) 4 )
#TODO: this is duplicated code, refactor this. remote_ip=$(getRemoteIP 4 $_ipv4_checker)
if [[ $? -gt 0 ]]; then if [[ $DYNB_UPDATE_METHOD == domrobot ]]; then
errorMessage "IPCheck (getRemoteIP 4) request failed $remote_ip" dns_ip=$(getDNSIP A)
return 0 else
fi dig_response=$(dig @${_DNS_checkServer} in a +short "$DYNB_DYN_DOMAIN")
if [[ $DYNB_UPDATE_METHOD == domrobot ]]; then if [[ $dig_response == ";; connection timed out; no servers could be reached" ]]; then
dns_ip=$(getDNSIP A) errorMessage "DNS request failed $dig_response"
else
dig_response=$(dig @${_DNS_checkServer} in a +short "$DYNB_DYN_DOMAIN")
#TODO: this is duplicated code, refactor this.
if [[ $dig_response == ";; connection timed out; no servers could be reached" ]]; then
errorMessage "DNS request failed $dig_response"
return 0 return 0
fi
dns_ip=$dig_response
fi fi
dns_ip=$dig_response _new_IPv4=$remote_ip
fi debugMessage "New IPv4: $_new_IPv4 old was: $dns_ip"
fi ;;
if [[ ${1} == 6 ]]; then 6 )
remote_ip=$(getRemoteIP 6 $_ipv6_checker) remote_ip=$(getRemoteIP 6 $_ipv6_checker)
#TODO: this is duplicated code, refactor this. if [[ $DYNB_UPDATE_METHOD == domrobot ]]; then
if [[ $? -gt 0 ]]; then dns_ip=$(getDNSIP AAAA)
errorMessage "IPCheck (getRemoteIP 6) request failed $remote_ip" else
return 0 dig_response=$(dig @${_DNS_checkServer} in aaaa +short "$DYNB_DYN_DOMAIN")
fi if [[ $dig_response == ";; connection timed out; no servers could be reached" ]]; then
if [[ $DYNB_UPDATE_METHOD == domrobot ]]; then errorMessage "DNS request failed $dig_response"
dns_ip=$(getDNSIP AAAA) return 0
else fi
dig_response=$(dig @${_DNS_checkServer} in aaaa +short "$DYNB_DYN_DOMAIN") dns_ip=$dig_response
#TODO: this is duplicated code, refactor this.
if [[ $dig_response == ";; connection timed out; no servers could be reached" ]]; then
errorMessage "DNS request failed $dig_response"
return 0
fi fi
dns_ip=$dig_response _new_IPv6=$remote_ip
fi debugMessage "New IPv6: $_new_IPv6 old was: $dns_ip"
fi ;;
* )
if [[ ${1} == 4 ]]; then ;;
_new_IPv4=$remote_ip esac
debugMessage "New IPv4: $_new_IPv4 old was: $dns_ip"
else
_new_IPv6=$remote_ip
debugMessage "New IPv6: $_new_IPv6 old was: $dns_ip"
fi
if [[ "$remote_ip" == "$dns_ip" ]]; then if [[ "$remote_ip" == "$dns_ip" ]]; then
return 0 return 0
@@ -761,9 +754,11 @@ function handleParameters() {
if [[ $DYNB_DEBUG == true ]]; then if [[ $DYNB_DEBUG == true ]]; then
_debug=1 _debug=1
fi fi
# shellcheck disable=SC2154
if [[ -n $DYNB_IPv4_CHECK_SITE ]]; then if [[ -n $DYNB_IPv4_CHECK_SITE ]]; then
_ipv4_checker=$DYNB_IPv4_CHECK_SITE _ipv4_checker=$DYNB_IPv4_CHECK_SITE
fi fi
# shellcheck disable=SC2154
if [[ -n $DYNB_IPv6_CHECK_SITE ]]; then if [[ -n $DYNB_IPv6_CHECK_SITE ]]; then
_ipv6_checker=$DYNB_IPv6_CHECK_SITE _ipv6_checker=$DYNB_IPv6_CHECK_SITE
fi fi