提交: 780fe960ede67678a2fa69fe088577dcaa587709 - main (git)

Commit MetaInfo

• 修訂: 780fe960ede67678a2fa69fe088577dcaa587709 (tree)
• 時間: 2012-09-28 19:02:24
• 作者: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

シーン遷移時の不具合を修正
公開鍵の受信が受信量制限に引っかかる不具合を修正

Change Summary

• modified: client/scene/Base.cpp
• modified: client/scene/Base.hpp
• modified: common/network/Session.cpp
• modified: common/network/Session.hpp
• modified: server/main.cpp

差異

--- a/client/scene/Base.cpp
+++ b/client/scene/Base.cpp
@@ -9,4 +9,11 @@ Base::~Base()
 {
 
 }
+
+BasePtr Base::NextScene() {
+	BasePtr ptr;
+	std::swap(ptr, next_scene_);
+	return ptr;
+}
+
 }

--- a/client/scene/Base.hpp
+++ b/client/scene/Base.hpp
@@ -21,7 +21,7 @@ class Base : public std::enable_shared_from_this<Base> {
 		virtual void ProcessInput(InputManager*) = 0;
 	    virtual void Draw() = 0;
 	    virtual void End() = 0;
-	    virtual BasePtr NextScene() {return next_scene_;};
+	    BasePtr NextScene();
 
 	protected:
 		BasePtr next_scene_;

--- a/common/network/Session.cpp
+++ b/common/network/Session.cpp
@@ -94,6 +94,18 @@ namespace network {
         }
     }
 
+	void Session::ResetReadByteAverage()
+	{
+		read_start_time_ = time(nullptr);
+		read_byte_sum_ = 0;
+	}
+
+	void Session::ResetWriteByteAverage()
+	{
+		write_start_time_ = time(nullptr);
+		write_byte_sum_ = 0;
+	}
+
     void Session::EnableEncryption()
     {
         encryption_ = true;

--- a/common/network/Session.hpp
+++ b/common/network/Session.hpp
@@ -48,6 +48,9 @@ namespace network {
             double GetReadByteAverage() const;
             double GetWriteByteAverage() const;
 
+			void ResetReadByteAverage();
+			void ResetWriteByteAverage();
+
             tcp::socket& tcp_socket();
             Encrypter& encrypter();
 

--- a/server/main.cpp
+++ b/server/main.cpp
@@ -187,6 +187,9 @@ int main(int argc, char* argv[])
                 uint32_t user_id = account.RegisterPublicKey(c.body());
 				assert(user_id > 0);
 
+				// 公開鍵で大量データを受信するので受信量制限をリセット
+				session->ResetReadByteAverage();
+
                 // ログイン
                 session->set_id(user_id);
                 account.LogIn(user_id);