diff --git a/f8/protoutils.cc b/f8/protoutils.cc index ad1b3b4..ae4b15f 100644 --- a/f8/protoutils.cc +++ b/f8/protoutils.cc @@ -28,14 +28,6 @@ namespace f8 return 0; } std::string msgid_enum_name; - #ifdef MATCHVS - if (msgname[0] == 'C' && msgname[1] == 'M') { - msgid_enum_name = "kingsomevs.CMMessageId_e"; - } else if (msgname[0] == 'S' && msgname[1] == 'M') { - msgid_enum_name = "kingsomevs.SMMessageId_e"; - } else if (msgname[0] == 'S' && msgname[1] == 'S') { - msgid_enum_name = "ss.SSMessageId_e"; - #else if (msgname[0] == 'C' && msgname[1] == 'M') { msgid_enum_name = "cs.CMMessageId_e"; } else if (msgname[0] == 'S' && msgname[1] == 'M') { @@ -44,7 +36,6 @@ namespace f8 msgid_enum_name = "ss.SSMessageId_e"; } else if (msgname[0] == 'I' && msgname[1] == 'M') { msgid_enum_name = "im.IMMessageId_e"; - #endif } else { assert(false); abort(); @@ -79,19 +70,6 @@ namespace f8 msg.SerializeToArray(buff + sizeof(PackHead), packlen); } - void Net_PackMsgOld(unsigned short msgid, ::google::protobuf::Message& msg, std::string& out) - { - int packlen = msg.ByteSize(); - - out.resize(sizeof(PackHeadOld) + packlen); - char* buff = (char*)out.data(); - PackHeadOld* head = (PackHeadOld*)buff; - head->packlen = packlen; - head->msgid = msgid; - head->magiccode = MAGIC_CODE; - msg.SerializeToArray(buff + sizeof(PackHeadOld), packlen); - } - int Net_SendMsg(a8::TcpClient* tcp_client, unsigned seqid, unsigned short msgid, const ::google::protobuf::Message& msg) { @@ -110,22 +88,6 @@ namespace f8 return sizeof(PackHead) + packlen; } - int Net_SendMsgOld(a8::TcpClient* tcp_client, unsigned int seqid, - unsigned short msgid, ::google::protobuf::Message& msg) - { - int packlen = msg.ByteSize(); - - char* buff = (char*)malloc(sizeof(f8::PackHeadOld) + packlen); - f8::PackHeadOld* head = (f8::PackHeadOld*)buff; - head->packlen = packlen; - head->msgid = msgid; - head->magiccode = MAGIC_CODE; - msg.SerializeToArray(buff + sizeof(f8::PackHeadOld), packlen); - tcp_client->SendBuff(buff, sizeof(f8::PackHeadOld) + packlen); - free(buff); - return sizeof(f8::PackHeadOld) + packlen; - } - int Net_SendBigMsg(a8::TcpClient* tcp_client, unsigned seqid, unsigned short msgid, ::google::protobuf::Message& msg) { @@ -162,22 +124,6 @@ namespace f8 return sizeof(PackHead) + packlen; } - int Net_SendMsgOld(a8::TcpListener* tcp_listener, unsigned short socket_handle, unsigned int seqid, - unsigned short msgid, ::google::protobuf::Message& msg) - { - int packlen = msg.ByteSize(); - - char* buff = (char*)malloc(sizeof(PackHeadOld) + packlen); - PackHeadOld* head = (PackHeadOld*)buff; - head->packlen = packlen; - head->msgid = msgid; - head->magiccode = MAGIC_CODE; - msg.SerializeToArray(buff + sizeof(PackHeadOld), packlen); - tcp_listener->SendClientMsg(socket_handle, buff, sizeof(PackHeadOld) + packlen); - free(buff); - return sizeof(PackHeadOld) + packlen; - } - int Net_SendBigMsg(a8::TcpListener* tcp_listener, unsigned short socket_handle, unsigned int seqid, unsigned short msgid, ::google::protobuf::Message& msg) { diff --git a/f8/protoutils.h b/f8/protoutils.h index 9f1d157..1123e35 100644 --- a/f8/protoutils.h +++ b/f8/protoutils.h @@ -17,13 +17,6 @@ namespace a8 namespace f8 { - //老消息头部(matchvs) - struct PackHeadOld - { - unsigned short packlen; - unsigned short msgid; - unsigned int magiccode; - }; //普通消息头部 struct PackHead @@ -80,28 +73,19 @@ namespace f8 unsigned short ext_len; }; - #ifdef MATCHVS - const unsigned int MAGIC_CODE = 0xAABBCCAA; - #else const unsigned short MAGIC_CODE = (((unsigned short)'S') << 8) | ((unsigned short)'K'); - #endif int Net_GetMessageId(const ::google::protobuf::Message& msg); void Net_PackMsg(unsigned short msgid, ::google::protobuf::Message& msg, std::string& out); - void Net_PackMsgOld(unsigned short msgid, ::google::protobuf::Message& msg, std::string& out); int Net_SendMsg(a8::TcpClient* tcp_client, unsigned int seqid, unsigned short msgid, const ::google::protobuf::Message& msg); - int Net_SendMsgOld(a8::TcpClient* tcp_client, unsigned int seqid, - unsigned short msgid, ::google::protobuf::Message& msg); int Net_SendBigMsg(a8::TcpClient* tcp_client, unsigned int seqid, unsigned short msgid, ::google::protobuf::Message& msg); int Net_SendMsg(a8::TcpClient* tcp_client, unsigned int seqid, unsigned short msgid, const char* msgbody, int msgbody_len); int Net_SendMsg(a8::TcpListener* tcp_tlistener, unsigned short socket_handle, unsigned int seqid, unsigned short msgid, const ::google::protobuf::Message& msg); - int Net_SendMsgOld(a8::TcpListener* tcp_tlistener, unsigned short socket_handle, unsigned int seqid, - unsigned short msgid, ::google::protobuf::Message& msg); int Net_SendBigMsg(a8::TcpListener* tcp_tlistener, unsigned short socket_handle, unsigned int seqid, unsigned short msgid, ::google::protobuf::Message& msg); int Net_BroadcastMsg(a8::TcpListener* tcp_tlistener, unsigned int seqid,