diff options
| author | Christoph Filnkößl <c@filnko.net> | 2016-10-25 00:30:35 +0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-10-25 13:47:57 -0200 |
| commit | 0e0f580d3905a228f5d0f11629b68d5605e3f071 (patch) | |
| tree | 9497dd2f108a2c9cac56ef9803f0b30703e45a71 /src/etc/inc/dyndns.class | |
| parent | f85a1e533b3f3ab8d78a50c2b061a17075b29099 (diff) | |
| download | pfsense-0e0f580d3905a228f5d0f11629b68d5605e3f071.zip pfsense-0e0f580d3905a228f5d0f11629b68d5605e3f071.tar.gz | |
dyndns: add header processing in curl
some dyndns implementations rely on the correct HTTP header being set. the information was lost and now fixed.
Diffstat (limited to 'src/etc/inc/dyndns.class')
| -rw-r--r-- | src/etc/inc/dyndns.class | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class index 059cb1f..ece3236 100644 --- a/src/etc/inc/dyndns.class +++ b/src/etc/inc/dyndns.class @@ -343,7 +343,7 @@ } if ($this->_dnsService != 'ods' and $this->_dnsService != 'route53 ') { - curl_setopt($ch, CURLOPT_HEADER, 0); + curl_setopt($ch, CURLOPT_HEADER, 1); curl_setopt($ch, CURLOPT_USERAGENT, $this->_UserAgent); curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE); curl_setopt($ch, CURLOPT_INTERFACE, 'if!' . $realparentif); @@ -837,8 +837,11 @@ break; } if ($this->_dnsService != 'ods' and $this->_dnsService != 'route53') { - $data = curl_exec($ch); - $this->_checkStatus($ch, $data); + $response = curl_exec($ch); + $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE); + $header = substr($response, 0, $header_size); + $data = substr($response, $header_size); + $this->_checkStatus($ch, $data, $header); @curl_close($ch); } } @@ -1349,14 +1352,12 @@ /* Responds with HTTP 200 on success. Responds with HTTP 4xx on error. Returns JSON data as body */ - $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE); - $header = substr($data, 0, $header_size); - $body = substr($data, $header_size); - if (preg_match("/Status: 200\s/i", $header)) { +; + if (preg_match("/\s200\sOK/i", $header)) { $status = $status_intro . $success_str . gettext("IP Address Updated Successfully!"); $successful_update = true; - } else if (preg_match("/Status: 4\d\d\s/i", $header)) { - $arrbody = json_decode($body, true); + } else if (preg_match("/\s4\d\d\s/i", $header)) { + $arrbody = json_decode($data, true); $message = $arrbody['message'] . "."; if (isset($arrbody['errors']['content'])) { foreach ($arrbody['errors']['content'] as $key => $content) { @@ -1366,8 +1367,8 @@ $status = $status_intro . $error_str . $message; } else { $status = $status_intro . "(" . gettext("Unknown Response") . ")"; - log_error($status_intro . gettext("PAYLOAD:") . " " . $body); - $this->_debug($body); + log_error($status_intro . gettext("PAYLOAD:") . " " . $data); + $this->_debug($data); } break; case 'googledomains': |
