* @license GPLv2
*/
-#include "service_gnudip.h"
-#include "util.h"
+#include "service_gnudip.hpp"
+#include "util.hpp"
#include <time.h>
#include <boost/foreach.hpp>
* @param _login The login name.
* @param _password The corresponding password.
*/
-ServiceGnudip::ServiceGnudip(const string& _protocol, const string& _gnudip_server, const string& _hostname, const string& _login, const string& _password, const Logger::Ptr& _logger, const int _update_interval, const int _max_updates_within_interval, const int _dns_cache_ttl, const string& _proxy, const int _proxy_port)
+ServiceGnudip::ServiceGnudip(const string& _protocol, const string& _gnudip_server, const string& _hostname, const string& _login, const string& _password, const Logger::Ptr& _logger, const int _update_interval, const int _max_updates_within_interval, const int _max_equal_updates_in_succession, const int _dns_cache_ttl, const string& _proxy, const int _proxy_port)
: GnudipServer(_gnudip_server)
{
if ( _update_interval == -1 ) // If _update_interval is default po::option_desc (not specified via config)
- set_update_interval(0); // use default protocol value
+ set_update_interval(15); // use default protocol value
else
set_update_interval(_update_interval);
if ( _max_updates_within_interval == -1 )
- set_max_updates_within_interval(0);
+ set_max_updates_within_interval(3);
else
set_max_updates_within_interval(_max_updates_within_interval);
+ if ( _max_equal_updates_in_succession == -1 )
+ set_max_equal_updates_in_succession(2);
+ else
+ set_max_equal_updates_in_succession(_max_equal_updates_in_succession);
+
if ( _dns_cache_ttl == -1 )
set_dns_cache_ttl(60);
else
map<string,string> response;
// regex for salt
- boost::regex expr_salt("<meta name=\"salt\" content=\"(.*)\">");
+ boost::regex expr_salt("<meta name=\"salt\" content=\"([^\"]*)\"");
// regex for time
- boost::regex expr_time("<meta name=\"time\" content=\"(.*)\">");
+ boost::regex expr_time("<meta name=\"time\" content=\"([^\"]*)\"");
// regex for sign
- boost::regex expr_sign("<meta name=\"sign\" content=\"(.*)\">");
+ boost::regex expr_sign("<meta name=\"sign\" content=\"([^\"]*)\"");
boost::smatch matches;
/**
+ * Parses the data received from the update request, which should contain the return code.
+ * @param curl_data The complete received curl data.
+ * @return A string containing the return code of the update request.
+ */
+string ServiceGnudip::parse_return_code(const string& curl_data) const
+{
+ string return_code;
+
+ // regex for return code
+ boost::regex expr_retc("<meta name=\"retc\" content=\"([^\"]*)\"");
+ boost::smatch matches;
+
+ // Get the return code out of received http data
+ if ( boost::regex_search(curl_data,matches,expr_retc) )
+ {
+ return_code = matches[1].str();
+ get_logger()->print_regex_match(expr_retc.str(),matches[1].str());
+ }
+ else
+ {
+ get_logger()->print_no_regex_match(expr_retc.str(),curl_data);
+ return return_code;
+ }
+
+ return return_code;
+}
+
+
+/**
* Get the assembled update url.
* @param salt Salt from the initial request
* @param time Time from the initial request
url.append("&user=");
url.append(get_login());
url.append("&domn=");
- url.append(get_hostname());
+ string fqhn = get_hostname();
+ string domain = fqhn.substr(fqhn.find('.')+1);
+ url.append(domain);
url.append("&pass=");
url.append(secret);
url.append("&reqc=0&addr=");
* @param ip IP Address to set.
* @return 0 if all is fine, -1 otherwise.
*/
-int ServiceGnudip::perform_update(const std::string& ip)
+Service::UpdateErrorCode ServiceGnudip::perform_update(const std::string& ip)
{
- if ( HTTPHelp->is_initialized() == true )
+ if ( HTTPHelp->is_initialized() )
{
// initial request
long http_status_code = HTTPHelp->http_get(BaseUrl);
if ( salt_time_sign.empty() )
{
get_logger()->print_could_not_parse_received_data(curl_data);
- return -1;
+ return GenericError;
}
// at this point we have salt, time and sign parsed successfully
catch ( exception& e )
{
get_logger()->print_exception_md5_sum(e.what());
- return -1;
+ return GenericError;
}
catch ( ... )
{
get_logger()->print_exception_md5_sum("Unknown exception");
- return -1;
+ return GenericError;
}
// append "." and salt and compute md5 sum and get the HEX representation
catch ( exception& e )
{
get_logger()->print_exception_md5_sum(e.what());
- return -1;
+ return GenericError;
}
catch ( ... )
{
get_logger()->print_exception_md5_sum("Unknown exception");
- return -1;
+ return GenericError;
}
// Now its time to issue the second http_get operation
- string url = assemble_update_url(salt, sign_time, sign, secret, ip);
+ string url = this->assemble_update_url(salt, sign_time, sign, secret, ip);
// perform the update operation
http_status_code = HTTPHelp->http_get(url);
if ( http_status_code == 200 )
{
// parse the update request return code
- string update_return_code = HTTPHelp->get_curl_data();
+ curl_data = HTTPHelp->get_curl_data();
+ string update_return_code = parse_return_code(curl_data);
if ( update_return_code == "0" )
{
- return 0;
+ return UpdateOk;
}
else if ( update_return_code == "1" )
{
get_logger()->print_service_not_authorized(url,get_login(),get_password());
+ return NotAuth;
}
else
{
get_logger()->print_update_failure(url,update_return_code);
+ return UpdateError;
}
}
else
}
else
{
- get_logger()->print_service_not_initialized(BaseUrl);
+ get_logger()->print_httphelper_not_initialized();
+ HTTPHelp->re_initialize();
}
- return -1;
+ return GenericError;
}
git://developer.intra2net.com / bpdyndnsd / blobdiff