diff --git a/.gitmodules b/.gitmodules index f38695b..c7af632 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "third_party/f8"] path = third_party/f8 url = git@git.kingsome.cn:server_common/f8.git +[submodule "third_party/kcp"] + path = third_party/kcp + url = git@git.kingsome.cn:libs/kcp.git diff --git a/server/wsproxy/GCListener.cc b/server/wsproxy/GCListener.cc index 7710c9b..5755809 100644 --- a/server/wsproxy/GCListener.cc +++ b/server/wsproxy/GCListener.cc @@ -245,6 +245,7 @@ private: if (buflen - offset < sizeof(f8::PackHead) + p->packlen) { break; } + //a8::XPrintf("Recv MsgId:%d\n", {p->msgid}); App::Instance()->AddSocketMsg(SF_Client, socket_handle_, 0, @@ -380,6 +381,7 @@ void GCListener::ProcUdpPacket(a8::UdpPacket* pkt) auto session = GetKcpSessionByRemoteKey(key); if (!session) { ++kcp_socket_handle_; + kcp_socket_handle_ = 123; session = std::make_shared(); session->Init(udp_listener_.get(), kcp_socket_handle_, pkt); kcp_session_addr_hash_[key] = session; diff --git a/server/wsproxy/upstream.cc b/server/wsproxy/upstream.cc index efae6a5..ed20720 100644 --- a/server/wsproxy/upstream.cc +++ b/server/wsproxy/upstream.cc @@ -21,6 +21,9 @@ void UpStream::Init(int instance_id, const std::string& remote_ip, int remote_po if (remote_ip.empty()) { abort(); } + #if 0 + remote_port = 7611; + #endif this->instance_id = instance_id; this->remote_ip = remote_ip; this->remote_port = remote_port; diff --git a/third_party/a8 b/third_party/a8 index 0348964..ac34ca2 160000 --- a/third_party/a8 +++ b/third_party/a8 @@ -1 +1 @@ -Subproject commit 03489644bf6b114254b879d948e66fd53b4f99a5 +Subproject commit ac34ca2d3b49af61a38ee8d6d67617fc344c1eaa diff --git a/third_party/kcp b/third_party/kcp new file mode 160000 index 0000000..10ee2b3 --- /dev/null +++ b/third_party/kcp @@ -0,0 +1 @@ +Subproject commit 10ee2b30c8739408c0db98211df4ebce7b01c0ed