Explorar o código

去掉checksum

Tang Hai %!s(int64=14) %!d(string=hai) anos
pai
achega
b1e092cba9

+ 1 - 2
Src/Egametang/Rpc/RpcChannel.cc

@@ -78,8 +78,7 @@ void RpcChannel::CallMethod(
 	RpcMeta meta;
 	meta.size = message.size();
 	meta.id = ++id_;
-	meta.opcode = string_hash(method->full_name());
-	meta.checksum = string_hash(message);
+	meta.method = string_hash(method->full_name());
 
 	SendMeta(meta, message);
 }

+ 3 - 15
Src/Egametang/Rpc/RpcCommunicator.h

@@ -19,27 +19,15 @@ struct RpcMeta
 	std::size_t id;
 
 	// 消息opcode, 是proto的full_path哈希值
-	std::size_t opcode;
+	std::size_t method;
 
-	// 校验值, 整个message的哈希值
-	std::size_t checksum;
-
-	RpcMeta(): size(0), id(0), opcode(0), checksum(0)
-	{
-	}
-
-	bool Verify(std::string message)
+	RpcMeta(): size(0), id(0), method(0)
 	{
-		boost::hash<std::string> string_hash;
-		if (checksum == string_hash(message))
-		{
-			return true;
-		}
-		return false;
 	}
 
 	std::string ToString()
 	{
+		return "";
 	}
 };
 

+ 4 - 8
Src/Egametang/Rpc/RpcCommunicatorTest.cc

@@ -69,8 +69,7 @@ public:
 		std::string response_string("response test rpc communicator string");
 		RpcMeta response_meta;
 		response_meta.size = response_string.size();
-		response_meta.checksum = string_hash(response_string);
-		response_meta.opcode = 123456;
+		response_meta.method = 123456;
 		SendMeta(response_meta, response_string);
 		barrier_.Signal();
 	}
@@ -122,8 +121,7 @@ public:
 		std::string send_string("send test rpc communicator string");
 		RpcMeta meta;
 		meta.size = send_string.size();
-		meta.checksum = string_hash(send_string);
-		meta.opcode = 654321;
+		meta.method = 654321;
 		SendMeta(meta, send_string);
 		RecvMeta();
 	}
@@ -173,13 +171,11 @@ TEST_F(RpcCommunicatorTest, SendAndRecvString)
 	boost::hash<std::string> string_hash;
 	ASSERT_EQ(std::string("send test rpc communicator string"), rpc_server_.recv_string_);
 	ASSERT_EQ(rpc_server_.meta_->size, rpc_server_.recv_string_.size());
-	ASSERT_EQ(rpc_server_.meta_->checksum, string_hash(rpc_server_.recv_string_));
-	ASSERT_EQ(654321U, rpc_server_.meta_->opcode);
+	ASSERT_EQ(654321U, rpc_server_.meta_->method);
 
 	ASSERT_EQ(std::string("response test rpc communicator string"), rpc_client_.recv_string_);
 	ASSERT_EQ(rpc_client_.meta_->size, rpc_client_.recv_string_.size());
-	ASSERT_EQ(rpc_client_.meta_->checksum, string_hash(rpc_client_.recv_string_));
-	ASSERT_EQ(123456U, rpc_client_.meta_->opcode);
+	ASSERT_EQ(123456U, rpc_client_.meta_->method);
 }
 
 } // namespace Egametang

+ 0 - 10
Tools/dbg.rb

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-def main()
-	puts "tanghai"
-end
-
-if __FILE__ == $0
-	# TODO Generated stub
-	main()
-end