diff options
| -rw-r--r-- | server/server/Makefile.mingw32 | 2 | ||||
| -rwxr-xr-x | server/server/config.cpp | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/server/server/Makefile.mingw32 b/server/server/Makefile.mingw32 index 5f1cc44..451a104 100644 --- a/server/server/Makefile.mingw32 +++ b/server/server/Makefile.mingw32 @@ -1,6 +1,8 @@ all: i686-pc-mingw32-g++ -c *.cpp -I/home/sss/temp/mingw/usr/i686-pc-mingw32/include -O2 -pipe -msse -fomit-frame-pointer -DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_FILESYSTEM_VERSION=2 -DBOOST_SYSTEM_STATIC_LINK=1 -DBOOST_THREAD_USE_LIB -DBOOST_THREAD_USE_LIB=1 -DUNICODE -DWIN32 -DWIN32_LEAN_AND_MEAN -D_UNICODE -D_WIN32 -D_WIN32_WINNT=0x0500 -D__USE_W32_SOCKETS i686-pc-mingw32-g++ -o server.exe *.o -lssl -lcrypto -lwldap32 -lcurl -lidn -lintl -liconv -lssh2 -lwldap32 -lz -lgnutls -lnettle -lhogweed -lgmp -lz -lssh2 -lgcrypt -lgpg-error -lboost_system-mt -lboost_date_time-mt -lboost_thread_win32-mt -lboost_random-mt -lboost_filesystem-mt -lmswsock -lws2_32 -lgdi32 -lz -Wl,-O1 -s + upx --best server.exe + 7z a server server.exe clean: rm *.o 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); } |