mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a timeout for curl_exec. Combine all dyndns.org methods to one catching up with its API changes.

Browse Source
This commit is contained in:
Ermal 2010-04-13 22:19:00 +00:00
parent c3c3e03bf1
commit 52e9528649
1 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
etc/inc/dyndns.class
View File

@ -171,12 +171,15 @@
curl_setopt($ch, CURLOPT_USERAGENT, $this->_UserAgent);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
curl_setopt($ch, CURLOPT_INTERFACE, $this->_ifIP);
curl_setopt($ch, CURLOPT_TIMEOUT, 30); // Completely empirical
}
switch ($this->_dnsService) {
case 'dyndns':
case 'dyndns-static':
case 'dyndns-custom':
$needsIP = FALSE;
log_error("DynDns: DynDns _update() starting. Dynamic");
//log_error("DynDns: DynDns _update() starting. Dynamic");
if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") $this->_dnsWildcard = "ON";
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass);
@ -192,40 +195,6 @@
curl_close($ch);
$this->_checkStatus($data);
break;
case 'dyndns-static':
$needsIP = FALSE;
if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") $this->_dnsWildcard = "ON";
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass);
$server = "https://members.dyndns.org/nic/update";
$port = "";
if($this->_dnsServer)
$server = $this->_dnsServer;
if($this->_dnsPort)
$port = ":" . $this->_dnsPort;
curl_setopt($ch, CURLOPT_URL, $server.$port.'?system=statdns&hostname='.$this->_dnsHost.'&myip='.$this->_dnsIP.'&wildcard='.$this->_dnsWildcard.'&mx='.$this->_dnsMX.'&backmx=NO');
$data = curl_exec($ch);
if (@curl_error($ch)) log_error("Curl error occurred: " . curl_error($ch));
curl_close($ch);
$this->_checkStatus($data);
break;
case 'dyndns-custom':
$needsIP = FALSE;
if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") $this->_dnsWildcard = "ON";
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass);
$server = "https://members.dyndns.org/nic/update";
$port = "";
if($this->_dnsServer)
$server = $this->_dnsServer;
if($this->_dnsPort)
$port = ":" . $this->_dnsPort;
curl_setopt($ch, CURLOPT_URL, $server.$port.'?system=custom&hostname='.$this->_dnsHost.'&myip='.$this->_dnsIP.'&wildcard='.$this->_dnsWildcard.'&mx='.$this->_dnsMX.'&backmx=NO');
$data = curl_exec($ch);
if (@curl_error($ch)) log_error("Curl errror occured: " . curl_error($ch));
curl_close($ch);
$this->_checkStatus($data);
break;
case 'dhs':
$needsIP = TRUE;
$post_data['hostscmd'] = 'edit';
@ -403,7 +372,6 @@
break;
case 'opendns':
$needsIP = FALSE;
log_error("DynDns: DynDns _update() starting. Dynamic");
if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") $this->_dnsWildcard = "ON";
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass);
@ -896,6 +864,7 @@
log_error("DynDns: _checkIP() starting.");
$ip_address = find_interface_ip($this->_if);
$this->_ifIP = $ip_address;
if (is_private_ip($ip_address)) {
$hosttocheck = "checkip.dyndns.org";
$checkip = gethostbyname($hosttocheck);