From a856bfa405b527a20bf00f25304b425d2936f358 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 15 Aug 2018 10:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0framework?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/wsproxy/app.cc         | 2 --
 server/wsproxy/target_conn.cc | 2 +-
 third_party/framework         | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/wsproxy/app.cc b/server/wsproxy/app.cc
index 777169c..0fba203 100644
--- a/server/wsproxy/app.cc
+++ b/server/wsproxy/app.cc
@@ -348,10 +348,8 @@ void App::ProcessTargetServerMsg(MsgHdr& hdr)
         return;
     }
     if (hdr.msgid == ss::_SS_CMLogin || hdr.msgid == ss::_SS_CMReConnect) {
-        #if 0
         GameClientMgr::Instance()->BindTargetConn(hdr.socket_handle, hdr.ip_saddr);
         GCListener::Instance()->MarkClient(hdr.socket_handle, true);
-        #endif
     }
     GCListener::Instance()->ForwardTargetConnMsg(hdr);
 }
diff --git a/server/wsproxy/target_conn.cc b/server/wsproxy/target_conn.cc
index 82e4228..3e6bfe3 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 0
+    #if 1
     head->rpc_error_code = 0;
     #endif
     head->socket_handle = hdr.socket_handle;
diff --git a/third_party/framework b/third_party/framework
index eeff827..5b0b534 160000
--- a/third_party/framework
+++ b/third_party/framework
@@ -1 +1 @@
-Subproject commit eeff8271e3cfd0b111ea81b2ee79bfe755e4f9fc
+Subproject commit 5b0b534ba49ef1b25a334d60ec3f039c46231901