Skip to content

change to ip address retrieval -> force cURL to either v4 or v6 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

change to ip address retrieval -> force cURL to either v4 or v6 #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,20 +92,37 @@ function initializeCurlHandlerPostNetcupAPI($request)
return $ch;
}

// Create cURL handler for get requests (for getting the current public IP)
function initializeCurlHandlerGetIP($url)
// Create cURL handler for get requests (for getting the current public IPv4)
function initializeCurlHandlerGetIPv4($url)
{
$ch = curl_init($url);
$curlOptions = array(
CURLOPT_USERAGENT => USERAGENT,
CURLOPT_TIMEOUT => 30,
CURLOPT_RETURNTRANSFER => 1,
CURLOPT_FAILONERROR => 1
CURLOPT_FAILONERROR => 1,
CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V4
);
curl_setopt_array($ch, $curlOptions);
return $ch;
}

// Create cURL handler for get requests (for getting the current public IPv6)
function initializeCurlHandlerGetIPv6($url)
{
$ch = curl_init($url);
$curlOptions = array(
CURLOPT_USERAGENT => USERAGENT,
CURLOPT_TIMEOUT => 30,
CURLOPT_RETURNTRANSFER => 1,
CURLOPT_FAILONERROR => 1,
CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V6
);
curl_setopt_array($ch, $curlOptions);
return $ch;
}


// Check if curl request was successful
function wasCurlSuccessful($ch)
{
Expand Down Expand Up @@ -300,7 +317,7 @@ function getCurrentPublicIPv4()
outputStdout('Getting IPv4 address from ' . IPV4_ADDRESS_URL . '.');

$url = IPV4_ADDRESS_URL;
$ch = initializeCurlHandlerGetIP($url);
$ch = initializeCurlHandlerGetIPv4($url);
$publicIP = trim(curl_exec($ch));

if (!wasCurlSuccessful($ch) || !isIPV4Valid($publicIP)) {
Expand All @@ -314,7 +331,7 @@ function getCurrentPublicIPv4()
if (!isIPV4Valid($publicIP) || $publicIP === false) {
outputWarning(IPV4_ADDRESS_URL . " didn't return a valid IPv4 address (Try $retryCount / $retryLimit). Trying fallback " . IPV4_ADDRESS_URL_FALLBACK);
$url = IPV4_ADDRESS_URL_FALLBACK;
$ch = initializeCurlHandlerGetIP($url);
$ch = initializeCurlHandlerGetIPv4($url);
$publicIP = trim(curl_exec($ch));
if (!wasCurlSuccessful($ch) || !isIPV4Valid($publicIP)) {
$retryCount = 1;
Expand Down Expand Up @@ -347,7 +364,7 @@ function getCurrentPublicIPv6()
outputStdout('Getting IPv6 address from ' . IPV6_ADDRESS_URL . '.');

$url = IPV6_ADDRESS_URL;
$ch = initializeCurlHandlerGetIP($url);
$ch = initializeCurlHandlerGetIPv6($url);
$publicIP = trim(curl_exec($ch));

if (!wasCurlSuccessful($ch) || !isIPV6Valid($publicIP)) {
Expand All @@ -361,7 +378,7 @@ function getCurrentPublicIPv6()
if (!isIPV6Valid($publicIP) || $publicIP === false) {
outputWarning(IPV6_ADDRESS_URL . " didn't return a valid IPv6 address (Try $retryCount / $retryLimit). Trying fallback " . IPV6_ADDRESS_URL_FALLBACK);
$url = IPV6_ADDRESS_URL_FALLBACK;
$ch = initializeCurlHandlerGetIP($url);
$ch = initializeCurlHandlerGetIPv6($url);
$publicIP = trim(curl_exec($ch));
if (!wasCurlSuccessful($ch) || !isIPV6Valid($publicIP)) {
$retryCount = 1;
Expand Down Expand Up @@ -554,3 +571,4 @@ function updateDnsRecords($domainname, $customernr, $apikey, $apisessionid, $dns
outputStderr(sprintf("Error while updating DNS Records: %s Exiting.", $result['longmessage']));
return false;
}