From dcc94042b01e75d4ab4701b9c2124c0c49d664f8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 15 Aug 2018 10:50:45 +0800 Subject: [PATCH] ok --- server/wsproxy/target_conn.cc | 2 +- server/wsproxy/target_conn.h | 6 ++++++ third_party/framework | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/wsproxy/target_conn.cc b/server/wsproxy/target_conn.cc index 3e6bfe3..82e4228 100644 --- a/server/wsproxy/target_conn.cc +++ b/server/wsproxy/target_conn.cc @@ -72,7 +72,7 @@ void TargetConn::ForwardClientMsg(MsgHdr& hdr) head->msgid = hdr.msgid; head->seqid = hdr.seqid; head->magic_code = MAGIC_CODE; - #if 1 + #if 0 head->rpc_error_code = 0; #endif head->socket_handle = hdr.socket_handle; diff --git a/server/wsproxy/target_conn.h b/server/wsproxy/target_conn.h index 44a527b..bc9eb01 100644 --- a/server/wsproxy/target_conn.h +++ b/server/wsproxy/target_conn.h @@ -1,5 +1,7 @@ #pragma once +#include "protoutils.h" + namespace a8 { class TcpClient; @@ -27,7 +29,11 @@ class TargetConn void SendMsg(T& msg) { static int msgid = ::Net_GetMessageId(msg); + #if 1 + Net_SendProxyCMsg(tcp_client_, msgid, msg); + #else Net_SendMsg(tcp_client_, 0, msgid, msg); + #endif } void ForwardClientMsg(MsgHdr& hdr); diff --git a/third_party/framework b/third_party/framework index 5b0b534..e3441de 160000 --- a/third_party/framework +++ b/third_party/framework @@ -1 +1 @@ -Subproject commit 5b0b534ba49ef1b25a334d60ec3f039c46231901 +Subproject commit e3441de0e0010e4b4f0f9d826ce7af50688c8ab5