Commit: 6aafe536499e73bfaf2214099c3a189a9c2ce2a2 - main (git)

Commit MetaInfo

• Revision: 6aafe536499e73bfaf2214099c3a189a9c2ce2a2 (tree)
• Time: 2012-09-13 01:13:47
• Author: angeart <angeart@git....>
• Commiter: angeart

Log Message

Merge branch 'master' of git.sourceforge.jp:/gitroot/mmo/main

Change Summary

• modified: common/Logger.hpp
• modified: common/network/Encrypter.cpp
• modified: common/unicode.hpp
• modified: server/Makefile
• modified: server/Server.cpp

Incremental Difference

--- a/common/Logger.hpp
+++ b/common/Logger.hpp
@@ -7,7 +7,7 @@
 #include "unicode.hpp"
 
 #ifndef _WIN32
-#define OutputDebugString(str) (str)
+#define OutputDebugString(str) (std::cout << str)
 #endif
 
 class Logger {
@@ -114,41 +114,41 @@ 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_;
 };

--- a/common/network/Encrypter.cpp
+++ b/common/network/Encrypter.cpp
@@ -166,10 +166,10 @@ std::string Encrypter::GetPublicKeyFingerPrint()
 
 std::string Encrypter::GetHash(const std::string& in)
 {
-    std::unique_ptr<byte[]> outbuf(new byte [CryptoPP::SHA512().DIGESTSIZE]);
+    std::unique_ptr<byte[]> outbuf(new byte [64]);
     CryptoPP::SHA512().CalculateDigest(outbuf.get(), (const byte*)in.data(), in.size());
 
-    return std::string((char*)outbuf.get(), CryptoPP::SHA512().DIGESTSIZE);
+    return std::string((char*)outbuf.get(), 64);
 }
 
 std::string Encrypter::GetTrip(const std::string& in)

--- a/common/unicode.hpp
+++ b/common/unicode.hpp
@@ -28,8 +28,8 @@ namespace unicode {
 
 #ifdef _WIN32
 
-std::string sjis2utf8(const std::string&);
-std::string utf82sjis(const std::string&);
+std::string sjis2utf8(std::string);
+std::string utf82sjis(std::string);
 
 std::string ToString(const std::wstring& s);
 std::wstring ToWString(const std::string& s);

--- a/server/Makefile
+++ b/server/Makefile
@@ -2,14 +2,15 @@ CC = gcc
 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)

--- a/server/Server.cpp
+++ b/server/Server.cpp
@@ -5,6 +5,7 @@
 #include "Server.hpp"
 #include <algorithm>
 #include <boost/make_shared.hpp>
+#include <boost/foreach.hpp>
 #include "../common/Logger.hpp"
 #include "../common/network/Command.hpp"
 #include "../common/network/Utils.hpp"