From 85bd008c039eb1d93894e94fba9d158a42a71a12 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Aug 2015 13:33:42 +0000 Subject: massive code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14910 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Xfire/src/sendmessagepacket.cpp | 137 ++++++++++++++++-------------- 1 file changed, 71 insertions(+), 66 deletions(-) (limited to 'protocols/Xfire/src/sendmessagepacket.cpp') diff --git a/protocols/Xfire/src/sendmessagepacket.cpp b/protocols/Xfire/src/sendmessagepacket.cpp index a0ca1400e1..05be382135 100644 --- a/protocols/Xfire/src/sendmessagepacket.cpp +++ b/protocols/Xfire/src/sendmessagepacket.cpp @@ -34,70 +34,75 @@ #include #include "xdebug.h" -namespace xfirelib { - using namespace std; - - std::map SendMessagePacket::imindexes; - - void SendMessagePacket::init(Client *client, string username, string message) { - BuddyListEntry *entry = client->getBuddyList()->getBuddyByName(username); - if (entry) { - setSid(entry->sid); - } - this->message = message; - initIMIndex(); - } - - void SendMessagePacket::initIMIndex() { - string str_sid(sid); - if ( imindexes.count( str_sid ) < 1 ) - imindex = imindexes[str_sid] = 1; - else - imindex = ++imindexes[str_sid]; - } - - void SendMessagePacket::setSid(const char *sid) { - memcpy(this->sid,sid,16); - } - - int SendMessagePacket::getPacketContent(char *buf) { - if ( imindex == 0 ) initIMIndex(); - - int index = 0; - VariableValue val; - val.setName("sid"); - val.setValue(sid,16); - - index += val.writeName(buf,index); - buf[index++] = 3; - index += val.writeValue(buf,index); - - val.setName("peermsg"); - index += val.writeName(buf,index); - buf[index++] = 5; - //buf[index++] = 7; - buf[index++] = 3; - - val.setName("msgtype"); - val.setValueFromLong(0,4); - index += val.writeName(buf,index); - buf[index++] = 2; - index += val.writeValue(buf,index); - - val.setName("imindex"); - val.setValueFromLong(imindex,4); - index += val.writeName(buf,index); - buf[index++] = 02; - index += val.writeValue(buf,index); - - val.setName("im"); - val.setValue((char*)message.c_str(),message.size()); - index += val.writeName(buf,index); - buf[index++] = 01; - buf[index++] = message.size()%256; - buf[index++] = (int)message.size()/256; - index += val.writeValue(buf,index); - - return index; - } +using namespace std; + +namespace xfirelib +{ + map SendMessagePacket::imindexes; + + void SendMessagePacket::init(Client *client, string username, string message) + { + BuddyListEntry *entry = client->getBuddyList()->getBuddyByName(username); + if (entry) { + setSid(entry->sid); + } + this->message = message; + initIMIndex(); + } + + void SendMessagePacket::initIMIndex() + { + string str_sid(sid); + if (imindexes.count(str_sid) < 1) + imindex = imindexes[str_sid] = 1; + else + imindex = ++imindexes[str_sid]; + } + + void SendMessagePacket::setSid(const char *sid) + { + memcpy(this->sid, sid, 16); + } + + int SendMessagePacket::getPacketContent(char *buf) + { + if (imindex == 0) initIMIndex(); + + int index = 0; + VariableValue val; + val.setName("sid"); + val.setValue(sid, 16); + + index += val.writeName(buf, index); + buf[index++] = 3; + index += val.writeValue(buf, index); + + val.setName("peermsg"); + index += val.writeName(buf, index); + buf[index++] = 5; + //buf[index++] = 7; + buf[index++] = 3; + + val.setName("msgtype"); + val.setValueFromLong(0, 4); + index += val.writeName(buf, index); + buf[index++] = 2; + index += val.writeValue(buf, index); + + val.setName("imindex"); + val.setValueFromLong(imindex, 4); + index += val.writeName(buf, index); + buf[index++] = 02; + index += val.writeValue(buf, index); + + val.setName("im"); + val.setValue((char*)message.c_str(), message.size()); + index += val.writeName(buf, index); + buf[index++] = 01; + buf[index++] = message.size() % 256; + buf[index++] = (int)message.size() / 256; + index += val.writeValue(buf, index); + + return index; + } } -- cgit v1.2.3