diff --git a/update/agent/include/agent/linux/datasid-conf.h b/update/agent/include/agent/linux/datasid-conf.h index befda28e20748491010bd6aeed5c37a4cc6164b6..aeddb1ef6fd570218cb61c043e1d6954252a1662 100644 --- a/update/agent/include/agent/linux/datasid-conf.h +++ b/update/agent/include/agent/linux/datasid-conf.h @@ -64,17 +64,8 @@ class Conf{ int getUpdateTries() const; int getUpdateTimeOut() const; - int sizeDataDir(); - int sizeLogDir(); - int sizeProxyConf(); - int sizeWebService(); - int sizeDelay(); - int sizeDaysToExpireLOg(); - int sizeUpdateTries(); - int sizeUpdateTimeOut(); - }; -bool checkFileConf(Conf& conf, Agent agent); +bool setConf(Conf& conf, Agent agent, map<string,string>& content); Conf datasid_conf(Agent agent); #endif \ No newline at end of file diff --git a/update/agent/include/agent/linux/datasid-parse.h b/update/agent/include/agent/linux/datasid-parse.h index 990c787d21207fc55ecbeb1015bdcb29afae78a9..243fe5f0c5be50c9ad220ee014495751cc51cda2 100644 --- a/update/agent/include/agent/linux/datasid-parse.h +++ b/update/agent/include/agent/linux/datasid-parse.h @@ -35,5 +35,4 @@ void parse ( string& line, map<string, string>& content); bool readfile (const string file, map<string,string>& content); bool spaceonly (const string& line); void trim (string& str); - #endif \ No newline at end of file diff --git a/update/agent/include/agent/linux/datasid-proxy.h b/update/agent/include/agent/linux/datasid-proxy.h index fdd01ef32b411e0d3741a1d781f21545a3dc1795..7c4cd2888709eb0f7b30de764620ce719c15b198 100644 --- a/update/agent/include/agent/linux/datasid-proxy.h +++ b/update/agent/include/agent/linux/datasid-proxy.h @@ -22,9 +22,11 @@ */ #include <locale> #include <sstream> +#include <map> #include "datasid-agent.h" #include "datasid-conf.h" #include "datasid-parse.h" +#include "datasid-proxy.h" using namespace std; @@ -47,5 +49,6 @@ class Proxy{ string getPassword() const; }; +bool setProxy(Proxy& proxy, map<string,string>& content); Proxy datasid_proxy(Conf conf); #endif \ No newline at end of file diff --git a/update/agent/src/linux/datasid-conf.cpp b/update/agent/src/linux/datasid-conf.cpp index ae42c29b91ed5705927291629951313b5f40013c..1ea981761cde59e236b154efe4b2c43bf34b7c2a 100644 --- a/update/agent/src/linux/datasid-conf.cpp +++ b/update/agent/src/linux/datasid-conf.cpp @@ -98,51 +98,6 @@ int Conf::getUpdateTimeOut() const{ return this->updateTimeOut; } -/* - * size Functions - * check if variables were setted.\ - */ - -int Conf::sizeDataDir() { - return this->dataDir.size(); -} - -int Conf::sizeLogDir() { - return this->logDir.size(); -} - -int Conf::sizeProxyConf() { - return this->proxyConf.size(); -} - -int Conf::sizeWebService() { - return this->webService.size(); -} - -int Conf::sizeDelay() { - ostringstream convert; - convert << this->delay; - return (convert.str()).size(); -} - -int Conf::sizeDaysToExpireLOg() { - ostringstream convert; - convert << this->daysToExpireLog; - return (convert.str()).size(); -} - -int Conf::sizeUpdateTries() { - ostringstream convert; - convert << this->updateTries; - return (convert.str()).size(); -} - -int Conf::sizeUpdateTimeOut() { - ostringstream convert; - convert << this->updateTimeOut; - return (convert.str()).size(); -} - /* * setConf Function * If variables from config file setted,