#include "unicode.hpp"
#ifndef _WIN32
-#define OutputDebugString(str) (str)
+#define OutputDebugString(str) (std::cout << str)
#endif
class Logger {
void Log(const tstring& prefix, const tstring& format) {
auto out = prefix + format + _T("\n");
OutputDebugString(out.c_str());
- std::wcout << unicode::ToWString(out);
- ofs_ << unicode::ToString(out);
+ // std::wcout << unicode::ToWString(out);
+ //ofs_ << unicode::ToString(out);
}
template<class T1>
void Log(const tstring& prefix, const tstring& format, const T1& t1) {
auto out = prefix + (tformat(format) % t1).str() + _T("\n");
OutputDebugString(out.c_str());
- std::wcout << unicode::ToWString(out);
- ofs_ << unicode::ToString(out);
+ // std::wcout << unicode::ToWString(out);
+ //ofs_ << unicode::ToString(out);
}
template<class T1, class T2>
void Log(const tstring& prefix, const tstring& format, const T1& t1, const T2& t2) {
auto out = prefix + (tformat(format) % t1 % t2).str() + _T("\n");
OutputDebugString(out.c_str());
- std::wcout << unicode::ToWString(out);
- ofs_ << unicode::ToString(out);
+ // std::wcout << unicode::ToWString(out);
+ //ofs_ << unicode::ToString(out);
}
template<class T1, class T2, class T3>
void Log(const tstring& prefix, const tstring& format, const T1& t1, const T2& t2, const T3& t3) {
auto out = prefix + (tformat(format) % t1 % t2 % t3).str() + _T("\n");
OutputDebugString(out.c_str());
- std::wcout << unicode::ToWString(out);
- ofs_ << unicode::ToString(out);
+ // std::wcout << unicode::ToWString(out);
+ //ofs_ << unicode::ToString(out);
}
template<class T1, class T2, class T3, class T4>
void Log(const tstring& prefix, const tstring& format, const T1& t1, const T2& t2, const T3& t3, const T4& t4) {
auto out = prefix + (tformat(format) % t1 % t2 % t3 % t4).str() + _T("\n");
OutputDebugString(out.c_str());
- std::wcout << unicode::ToWString(out);
- ofs_ << unicode::ToString(out);
+ // std::wcout << unicode::ToWString(out);
+ //ofs_ << unicode::ToString(out);
}
- std::ofstream ofs_;
+ std::ofstream ofs_;
};
\r
std::string Encrypter::GetHash(const std::string& in)\r
{\r
- std::unique_ptr<byte[]> outbuf(new byte [CryptoPP::SHA512().DIGESTSIZE]);\r
+ std::unique_ptr<byte[]> outbuf(new byte [64]);\r
CryptoPP::SHA512().CalculateDigest(outbuf.get(), (const byte*)in.data(), in.size());\r
\r
- return std::string((char*)outbuf.get(), CryptoPP::SHA512().DIGESTSIZE);\r
+ return std::string((char*)outbuf.get(), 64);\r
}\r
\r
std::string Encrypter::GetTrip(const std::string& in)\r
CXX = g++
LD = g++
-CXXFLAGS = -g -ggdb -Wall -std=gnu++0x
-LIBS = -lboost_system -lboost_thread -lboost_date_time -lboost_filesystem -lboost_regex \
- -lpthread -lssl -lcrypto -ldl -lrt
-LIBDIRS = -L/usr/local/lib
+CXXFLAGS = -g -ggdb -Wall -std=gnu++0x -I/usr/include/cryptopp
+LIBS = -lcryptopp -lboost_system -lboost_thread -lboost_date_time -lboost_filesystem -lboost_regex \
+ -lpthread -lssl -ldl -lrt
+LIBDIRS = -L/usr/lib -L/usr/local/lib
TARGET = server
OBJS := $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJS += $(patsubst %.cpp,%.o,$(wildcard ../common/network/*.cpp))
+OBJS += $(patsubst %.c,%.o,$(wildcard ../common/network/lz4/*.c))
all: $(OBJS)
$(LD) $(CXXFLAGS) -o $(TARGET) $(OBJS) $(LIBS) $(LIBDIRS)