--- smsdaemon/common.h 2008/12/07 21:42:15 150 +++ smsdaemon/Common.h 2008/12/23 12:09:08 216 @@ -2,7 +2,7 @@ #define __COMMON_H__ #include - +#include //time_t is defines as long int ! //No need to include time.h @@ -28,6 +28,7 @@ int uid; int gid; volatile bool mainContinue; + volatile bool reloadConfig; std::string configFilePath; @@ -36,6 +37,7 @@ long int daemonStart; + SmsCounter smsCounter; class PluginManager* GetPluginManager(); @@ -43,16 +45,21 @@ class ConfigFile* GetConfigfile(); void SetConfigfile(class ConfigFile*); - void logMessage(std::string str); - void setLogfile(std::string file) {_logFile = file;} void loadConfig(int argc, char* argv[]); - std::string getStatusMessage(); + void LoadLists(); //load blacklist & privileged + bool IsBlacklisted(const std::string& phone); + bool IsPrivileged(const std::string& phone); + + std::string getStatusMessage(); private: Common(); Common(const Common&) {} - Common& operator=(const Common) {return *this;} + Common& operator=(const Common) + { + return *this; + } ~Common(); @@ -62,8 +69,11 @@ class ConfigFile* _configFile; void printUsage(); + void LoadWorker(std::set& set, std::string config); + - std::string _logFile; + std::set _blacklist; + std::set _privileged; };