diff options
Diffstat (limited to 'server/server/config.cpp')
| -rwxr-xr-x | server/server/config.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/server/server/config.cpp b/server/server/config.cpp index 51a082a..8159d02 100755 --- a/server/server/config.cpp +++ b/server/server/config.cpp @@ -200,14 +200,14 @@ void config::load_upload_list(char *pth) config.close(); if(!cfg_str.empty()) { + if(!upload_list.empty()) + upload_list.clear(); std::string::size_type p1 = 0, p2 = 0, l = 1; if(cfg_str.find("\r\n") != std::string::npos) l = 2; p2 = cfg_str.find(';'); while(p2 != std::string::npos) { - if(!upload_list.empty()) - upload_list.clear(); std::string line = cfg_str.substr(p1, p2-p1); p1 = p2+l+1; std::string::size_type lp1 = 0, lp2 = 0; @@ -428,13 +428,15 @@ void config::load_firewall_list(char* pth) if(!firewall_list.empty()) firewall_list.clear(); std::string::size_type p1 = 0, p2 = 0, l = 1; - if(cfg_str.find("\r\n") != std::string::npos) - l = 2; +// if(cfg_str.find("\r\n") != std::string::npos) +// l = 2; p2 = cfg_str.find(';'); while(p2 != std::string::npos) { std::string line = cfg_str.substr(p1, p2-p1); - p1 = p2+l+1; + //p1 = p2+l+1; + p1 = p2+1; + line.insert(0, "block "); firewall_list.push_back(line); p2 = cfg_str.find(';', p1); } |