Editing Mod protocol
From EMule Wiki
Warning: The database has been locked for maintenance, so you will not be able to save your edits right now. You may wish to cut-n-paste the text into a text file and save it for later.
The administrator who locked it offered this explanation: site maintenance
The edit can be undone.
Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.
Latest revision | Your text | ||
Line 1: | Line 1: | ||
− | = Under construction = | + | >= Under construction = |
THIS IS NOT FINAL.. feel free to edit. | THIS IS NOT FINAL.. feel free to edit. | ||
Line 17: | Line 17: | ||
When a hello(answer) with a set mod bit is received the ConnectionEstablished has to be delayed. Instead of that the mod info packet with the opcode OP_MODINFOPACKET is to be sent. | When a hello(answer) with a set mod bit is received the ConnectionEstablished has to be delayed. Instead of that the mod info packet with the opcode OP_MODINFOPACKET is to be sent. | ||
ConnectionEstablished will be triggered when the mod info packet is received. | ConnectionEstablished will be triggered when the mod info packet is received. | ||
− | + | <pre> | |
A B | A B | ||
− | Hello --- | + | Hello ---> MB Set (see if ModBit is set) |
− | MB Set | + | MB Set <--- Hello Answer |
− | ConEst | + | ConEst <--- MInfo (Mod Info) |
− | MInfo --- | + | MInfo ---> ConEst (call ConnectionEstablished) |
− | + | </pre> | |
The mod info packet has to contain eMuleTags that announce the supported features. The packet is made up this way: | The mod info packet has to contain eMuleTags that announce the supported features. The packet is made up this way: | ||
− | + | <pre> | |
− | + | <uint 32> tag count | |
− | + | <emule tag 1> | |
− | + | <emule tag 2> | |
... | ... | ||
− | + | <emule tag n> | |
− | + | </pre> | |
It's only allowed to use mod features it their capability was announced by both sides. | It's only allowed to use mod features it their capability was announced by both sides. | ||
After the capability exchange via OP_MODINFOPACKET all remaining opcodes are allowed to be used by clients in any way they want. | After the capability exchange via OP_MODINFOPACKET all remaining opcodes are allowed to be used by clients in any way they want. | ||
Line 43: | Line 43: | ||
in baseclient.cpp, void CUpDownClient::SendHelloTypePacket(CSafeMemFile* data) | in baseclient.cpp, void CUpDownClient::SendHelloTypePacket(CSafeMemFile* data) | ||
− | + | <pre> | |
// eMule Misc. Options #2 | // eMule Misc. Options #2 | ||
const UINT uKadVersion = KADEMLIA_VERSION; | const UINT uKadVersion = KADEMLIA_VERSION; | ||
Line 49: | Line 49: | ||
const UINT uExtMultiPacket = 1; | const UINT uExtMultiPacket = 1; | ||
// Set the Mod Bit | // Set the Mod Bit | ||
− | const UINT uModProt = 1; // mod bit // NEO: NMP - [NeoModProt] | + | const UINT uModProt = 1; // mod bit // NEO: NMP - [NeoModProt] <-- Xanatos -- |
const UINT uSupportsCryptLayer = thePrefs.IsClientCryptLayerSupported() ? 1 : 0; | const UINT uSupportsCryptLayer = thePrefs.IsClientCryptLayerSupported() ? 1 : 0; | ||
const UINT uRequestsCryptLayer = thePrefs.IsClientCryptLayerRequested() ? 1 : 0; | const UINT uRequestsCryptLayer = thePrefs.IsClientCryptLayerRequested() ? 1 : 0; | ||
Line 57: | Line 57: | ||
CTag tagMisOptions2(CT_EMULE_MISCOPTIONS2, | CTag tagMisOptions2(CT_EMULE_MISCOPTIONS2, | ||
// (RESERVED ) | // (RESERVED ) | ||
− | (uSupportsSourceEx2 | + | (uSupportsSourceEx2 << 10) | |
− | (uRequiresCryptLayer | + | (uRequiresCryptLayer << 9) | |
− | (uRequestsCryptLayer | + | (uRequestsCryptLayer << 8) | |
− | (uSupportsCryptLayer | + | (uSupportsCryptLayer << 7) | |
− | (uModProt | + | (uModProt << 6) | |
− | (uExtMultiPacket | + | (uExtMultiPacket << 5) | |
− | (uSupportLargeFiles | + | (uSupportLargeFiles << 4) | |
− | (uKadVersion | + | (uKadVersion << 0) |
); | ); | ||
tagMisOptions2.WriteTagToFile(data); | tagMisOptions2.WriteTagToFile(data); | ||
− | + | </pre> | |
=== Processing hello(answer) packets === | === Processing hello(answer) packets === | ||
Line 74: | Line 74: | ||
baseclient.cpp bool CUpDownClient::ProcessHelloTypePacket(CSafeMemFile* data) | baseclient.cpp bool CUpDownClient::ProcessHelloTypePacket(CSafeMemFile* data) | ||
− | + | <pre> | |
case CT_EMULE_MISCOPTIONS2: | case CT_EMULE_MISCOPTIONS2: | ||
// 21 Reserved | // 21 Reserved | ||
Line 86: | Line 86: | ||
// 4 Kad Version | // 4 Kad Version | ||
if (temptag.IsInt()) { | if (temptag.IsInt()) { | ||
− | m_fSupportsSourceEx2 = (temptag.GetInt() | + | m_fSupportsSourceEx2 = (temptag.GetInt() >> 10) & 0x01; |
− | m_fRequiresCryptLayer = (temptag.GetInt() | + | m_fRequiresCryptLayer = (temptag.GetInt() >> 9) & 0x01; |
− | m_fRequestsCryptLayer = (temptag.GetInt() | + | m_fRequestsCryptLayer = (temptag.GetInt() >> 8) & 0x01; |
− | m_fSupportsCryptLayer = (temptag.GetInt() | + | m_fSupportsCryptLayer = (temptag.GetInt() >> 7) & 0x01; |
// read the mod bit | // read the mod bit | ||
− | m_fSupportsModProt = (temptag.GetInt() | + | m_fSupportsModProt = (temptag.GetInt() >> 6) & 0x01; // NEO: NMP - [NeoModProt] <-- Xanatos -- |
− | m_fExtMultiPacket = (temptag.GetInt() | + | m_fExtMultiPacket = (temptag.GetInt() >> 5) & 0x01; |
− | m_fSupportsLargeFiles = (temptag.GetInt() | + | m_fSupportsLargeFiles = (temptag.GetInt() >> 4) & 0x01; |
− | m_byKadVersion = (uint8)((temptag.GetInt() | + | m_byKadVersion = (uint8)((temptag.GetInt() >> 0) & 0x0f); |
dwEmuleTags |= 8; | dwEmuleTags |= 8; | ||
if (bDbgInfo) | if (bDbgInfo) | ||
− | m_strHelloInfo.AppendFormat(_T( | + | m_strHelloInfo.AppendFormat(_T("\n KadVersion=%u, LargeFiles=%u ExtMultiPacket=%u CryptLayerSupport=%u CryptLayerRequest=%u CryptLayerRequires=%u m_fSupportsSourceEx2=%u"), m_byKadVersion, m_fSupportsLargeFiles, m_fExtMultiPacket, m_fSupportsCryptLayer, m_fRequestsCryptLayer, m_fRequiresCryptLayer, m_fSupportsSourceEx2); |
− | m_fRequestsCryptLayer &= m_fSupportsCryptLayer; | + | m_fRequestsCryptLayer &= m_fSupportsCryptLayer; |
− | m_fRequiresCryptLayer &= m_fRequestsCryptLayer; | + | m_fRequiresCryptLayer &= m_fRequestsCryptLayer; |
− | + | </pre> | |
== Sending hello answer and modprot info == | == Sending hello answer and modprot info == | ||
Listensocket.cpp bool CClientReqSocket::ProcessPacket(const BYTE* packet, uint32 size, UINT opcode) | Listensocket.cpp bool CClientReqSocket::ProcessPacket(const BYTE* packet, uint32 size, UINT opcode) | ||
− | + | <pre>if (client->GetHashType() == SO_EMULE && !bIsMuleHello) | |
− | client- | + | client->SendMuleInfoPacket(false); |
− | client- | + | client->SendHelloAnswer(); |
if (client) | if (client) | ||
{ | { | ||
− | // NEO: NMP - [NeoModProt] -- Xanatos -- | + | // NEO: NMP - [NeoModProt] -- Xanatos --> |
− | if(client- | + | if(client->GetNeoModProtVersion()) |
− | client- | + | client->SendModInfoPacket(); |
− | + | </pre> | |
Example of SendModInfoPacket: | Example of SendModInfoPacket: | ||
− | + | <pre> | |
void CUpDownClient::SendModInfoPacket(){ | void CUpDownClient::SendModInfoPacket(){ | ||
if (socket == NULL){ // first we check if we have a valid socket, actualy we was called form the socket so this check is rather unnesesery, but in case | if (socket == NULL){ // first we check if we have a valid socket, actualy we was called form the socket so this check is rather unnesesery, but in case | ||
Line 136: | Line 136: | ||
// in this sample its an normal tag with an uint8 ID, its the modstring 0x55 = 'T' | // in this sample its an normal tag with an uint8 ID, its the modstring 0x55 = 'T' | ||
data.WriteUInt32(tagcount); // nr. of tags | data.WriteUInt32(tagcount); // nr. of tags | ||
− | CTag tagPartStatus(0x55,_T( | + | CTag tagPartStatus(0x55,_T("TestMod")); |
− | tagPartStatus.WriteNewEd2kTag(&data); | + | tagPartStatus.WriteNewEd2kTag(&data); |
// write the secund tag (Nr.2) | // write the secund tag (Nr.2) | ||
// in this sample its an custom named tag with an string as ID | // in this sample its an custom named tag with an string as ID | ||
− | CTag tagMyMail( | + | CTag tagMyMail("Mod:eMail",_T("User@Domain.com")); |
− | tagMyMail.WriteNewEd2kTag(&data); | + | tagMyMail.WriteNewEd2kTag(&data); |
// we are done writing tags | // we are done writing tags | ||
// now we create a packet and put what we have writen in it | // now we create a packet and put what we have writen in it | ||
− | Packet* packet = new Packet(&data,OP_MODPROT); | + | Packet* packet = new Packet(&data,OP_MODPROT); |
− | packet- | + | packet->opcode = OP_MODINFOPACKET; |
− | if (thePrefs.GetDebugClientTCPLevel() | + | if (thePrefs.GetDebugClientTCPLevel() > 0) |
− | DebugSend( | + | DebugSend("OP__ModInfoPacket", this); |
− | theStats.AddUpDataOverheadOther(packet- | + | theStats.AddUpDataOverheadOther(packet->size); |
− | socket- | + | socket->SendPacket(packet,true,true); // we send the packet |
} | } | ||
− | + | </pre> | |
− | === Delaying ConnectionEstablished & sending the mod info packet === | + | === Delaying ConnectionEstablished & sending the mod info packet === |
listensocket.cpp | listensocket.cpp | ||
bool CClientReqSocket::ProcessPacket(const BYTE* packet, uint32 size, UINT opcode) | bool CClientReqSocket::ProcessPacket(const BYTE* packet, uint32 size, UINT opcode) | ||
− | + | <pre> | |
case OP_HELLOANSWER: | case OP_HELLOANSWER: | ||
{ | { | ||
theStats.AddDownDataOverheadOther(size); | theStats.AddDownDataOverheadOther(size); | ||
− | client- | + | client->ProcessHelloAnswer(packet,size); |
− | if (thePrefs.GetDebugClientTCPLevel() | + | if (thePrefs.GetDebugClientTCPLevel() > 0){ |
− | DebugRecv( | + | DebugRecv("OP_HelloAnswer", client); |
− | Debug(_T( | + | Debug(_T(" %s\n"), client->DbgGetHelloInfo()); |
} | } | ||
− | // NEO: NMP - [NeoModProt] -- Xanatos -- | + | // NEO: NMP - [NeoModProt] -- Xanatos --> |
− | if(client- | + | if(client->SupportsModProt() == 0) // check for mod prot |
// we will start the SUI when we recieve the mod info packet | // we will start the SUI when we recieve the mod info packet | ||
− | // NEO: NMP END | + | // NEO: NMP END <-- Xanatos -- |
{ | { | ||
// start secure identification, if | // start secure identification, if | ||
// - we have received OP_EMULEINFO and OP_HELLOANSWER (old eMule) | // - we have received OP_EMULEINFO and OP_HELLOANSWER (old eMule) | ||
// - we have received eMule-OP_HELLOANSWER (new eMule) | // - we have received eMule-OP_HELLOANSWER (new eMule) | ||
− | if (client- | + | if (client->GetInfoPacketsReceived() == IP_BOTH) |
− | client- | + | client->InfoPacketsReceived(); |
} | } | ||
if (client) | if (client) | ||
{ | { | ||
− | // NEO: NMP - [NeoModProt] -- Xanatos -- | + | // NEO: NMP - [NeoModProt] -- Xanatos --> |
− | if (client- | + | if (client->SupportsModProt()) // if this cleint uses mod protocol extensions |
− | client- | + | client->SendModInfoPacket(); // we send him the mod info packet with our rxtensions |
else // we *dont* call ConnectionEstablished at this point, | else // we *dont* call ConnectionEstablished at this point, | ||
// when will call ConnectionEstablished when we recieve the Mod Info frm this cleint | // when will call ConnectionEstablished when we recieve the Mod Info frm this cleint | ||
− | // NEO: NMP END | + | // NEO: NMP END <-- Xanatos -- |
{ | { | ||
− | client- | + | client->ConnectionEstablished(); |
− | theApp.emuledlg- | + | theApp.emuledlg->transferwnd->clientlistctrl.RefreshClient(client); |
} | } | ||
} | } | ||
break; | break; | ||
} | } | ||
− | + | </pre> | |
listensocket.cpp | listensocket.cpp | ||
bool CClientReqSocket::ProcessPacket(const BYTE* packet, uint32 size, UINT opcode) | bool CClientReqSocket::ProcessPacket(const BYTE* packet, uint32 size, UINT opcode) | ||
− | + | <pre> | |
case OP_HELLO: | case OP_HELLO: | ||
{ | { | ||
Line 208: | Line 208: | ||
if (client) | if (client) | ||
{ | { | ||
− | // NEO: NMP - [NeoModProt] -- Xanatos -- | + | // NEO: NMP - [NeoModProt] -- Xanatos --> |
− | if(client- | + | if(client->SupportsModProt()) // if this cleint uses mod protocol extensions |
− | client- | + | client->SendModInfoPacket(); // we send him the mod info packet with our rxtensions |
else // we *dont* call ConnectionEstablished at this point, | else // we *dont* call ConnectionEstablished at this point, | ||
// when will call ConnectionEstablished when we recieve the Mod Info frm this cleint | // when will call ConnectionEstablished when we recieve the Mod Info frm this cleint | ||
− | // NEO: NMP END | + | // NEO: NMP END <-- Xanatos -- |
− | client- | + | client->ConnectionEstablished(); |
} | } | ||
Line 220: | Line 220: | ||
if(client) | if(client) | ||
{ | { | ||
− | // NEO: NMP - [NeoModProt] -- Xanatos -- | + | // NEO: NMP - [NeoModProt] -- Xanatos --> |
− | if(client- | + | if(client->SupportsModProt() == 0) // check for mod prot |
// we will start the SUI when we recieve the mod info packet | // we will start the SUI when we recieve the mod info packet | ||
− | // NEO: NMP END | + | // NEO: NMP END <-- Xanatos -- |
{ | { | ||
// start secure identification, if | // start secure identification, if | ||
// - we have received eMule-OP_HELLO (new eMule) | // - we have received eMule-OP_HELLO (new eMule) | ||
− | if (client- | + | if (client->GetInfoPacketsReceived() == IP_BOTH) |
− | client- | + | client->InfoPacketsReceived(); |
} | } | ||
− | if( client- | + | if( client->GetKadPort() ) |
− | Kademlia::CKademlia::Bootstrap(ntohl(client- | + | Kademlia::CKademlia::Bootstrap(ntohl(client->GetIP()), client->GetKadPort(), (client->GetKadVersion() > 1)); |
} | } | ||
break; | break; | ||
} | } | ||
− | + | </pre> | |
=== Processing the modinfo packet === | === Processing the modinfo packet === | ||
listensocket.cpp | listensocket.cpp | ||
− | + | <pre> | |
bool CClientReqSocket::ProcessModPacket(const BYTE* packet, uint32 size, UINT opcode, UINT uRawSize) | bool CClientReqSocket::ProcessModPacket(const BYTE* packet, uint32 size, UINT opcode, UINT uRawSize) | ||
{ | { | ||
Line 254: | Line 254: | ||
throw GetResString(IDS_ERR_UNKNOWNCLIENTACTION); | throw GetResString(IDS_ERR_UNKNOWNCLIENTACTION); | ||
} | } | ||
− | if (thePrefs.m_iDbgHeap | + | if (thePrefs.m_iDbgHeap >= 2) |
ASSERT_VALID(client); | ASSERT_VALID(client); | ||
Line 261: | Line 261: | ||
case OP_MODINFOPACKET: | case OP_MODINFOPACKET: | ||
{ | { | ||
− | if (thePrefs.GetDebugClientTCPLevel() | + | if (thePrefs.GetDebugClientTCPLevel() > 0) |
− | DebugRecv( | + | DebugRecv("OP__ModInfoPacket", client); |
theStats.AddDownDataOverheadOther(uRawSize); | theStats.AddDownDataOverheadOther(uRawSize); | ||
− | if(client- | + | if(client->GetNeoModProtVersion() == 0) |
− | throw CString(_T( | + | throw CString(_T("Recieved Neo Mod Info Packet from a cleint whitch doe snot support this feature!")); |
− | client- | + | client->ProcessModInfoPacket(packet,size); |
// Now after we have all informations about the cleint the connection is established | // Now after we have all informations about the cleint the connection is established | ||
− | client- | + | client->ConnectionEstablished(); |
// start secure identification, if | // start secure identification, if | ||
// - we have received OP_MODINFOPACKET, (Neo Compatible new eMule mods) | // - we have received OP_MODINFOPACKET, (Neo Compatible new eMule mods) | ||
− | if (client- | + | if (client->GetInfoPacketsReceived() == IP_BOTH) |
− | client- | + | client->InfoPacketsReceived(); |
break; | break; | ||
} | } | ||
Line 284: | Line 284: | ||
{ | { | ||
... | ... | ||
− | + | </pre> | |
Line 291: | Line 291: | ||
baseclient.cpp | baseclient.cpp | ||
− | + | <pre> | |
void CUpDownClient::ProcessModInfoPacket(const uchar* pachPacket, uint32 nSize) | void CUpDownClient::ProcessModInfoPacket(const uchar* pachPacket, uint32 nSize) | ||
{ | { | ||
Line 301: | Line 301: | ||
uint32 tagcount = data.ReadUInt32(); | uint32 tagcount = data.ReadUInt32(); | ||
if (bDbgInfo) | if (bDbgInfo) | ||
− | m_strModInfo.AppendFormat(_T( | + | m_strModInfo.AppendFormat(_T(" Tags=%u"), (UINT)tagcount); |
// now we are going to read all of them | // now we are going to read all of them | ||
− | for (uint32 i = 0; i | + | for (uint32 i = 0; i < tagcount; i++) |
{ | { | ||
− | CTag temptag(&data, false); | + | CTag temptag(&data, false); |
switch (temptag.GetNameID()) // here we distinguish only tags with an uint8 ID, all named tags are handled below | switch (temptag.GetNameID()) // here we distinguish only tags with an uint8 ID, all named tags are handled below | ||
{ | { | ||
case 0x55: | case 0x55: | ||
if (temptag.IsStr()) | if (temptag.IsStr()) | ||
− | Log(_T( | + | Log(_T("ModString %s", temptag.GetStr())); |
else if (bDbgInfo) | else if (bDbgInfo) | ||
− | m_strModInfo.AppendFormat(_T( | + | m_strModInfo.AppendFormat(_T("\n ***UnkType=%s"), temptag.GetFullInfo()); |
break; | break; | ||
Line 318: | Line 318: | ||
// now we habdle custom named tags, we use a series of (else)if's and strcmp, note: this is *not* unicide!!! | // now we habdle custom named tags, we use a series of (else)if's and strcmp, note: this is *not* unicide!!! | ||
− | if(strcmp(temptag.GetName(), | + | if(strcmp(temptag.GetName(),"Mod:Hello") == 0) |
{ | { | ||
if(temptag.IsStr()) | if(temptag.IsStr()) | ||
− | Log(LOG_SUCCESS,_T( | + | Log(LOG_SUCCESS,_T("*** Greathings from %s: %s"),GetUserName(),temptag.GetStr()); |
} | } | ||
else | else | ||
if (bDbgInfo) | if (bDbgInfo) | ||
− | m_strModInfo.AppendFormat(_T( | + | m_strModInfo.AppendFormat(_T("\n ***UnkTag=%s"), temptag.GetFullInfo()); |
} | } | ||
} | } | ||
// some debug output | // some debug output | ||
− | if (bDbgInfo && data.GetPosition() | + | if (bDbgInfo && data.GetPosition() < data.GetLength()){ |
− | m_strModInfo.AppendFormat(_T( | + | m_strModInfo.AppendFormat(_T("\n ***AddData: %u bytes"), data.GetLength() - data.GetPosition()); |
} | } | ||
} | } | ||
− | + | </pre> | |
=== Processing mod data example === | === Processing mod data example === | ||
Line 342: | Line 342: | ||
EMSocket.cpp | EMSocket.cpp | ||
void CEMSocket::OnReceive(int nErrorCode) | void CEMSocket::OnReceive(int nErrorCode) | ||
− | + | <pre> | |
− | switch (pendingPacket- | + | switch (pendingPacket->prot){ |
case OP_EDONKEYPROT: | case OP_EDONKEYPROT: | ||
case OP_PACKEDPROT: | case OP_PACKEDPROT: | ||
case OP_EMULEPROT: | case OP_EMULEPROT: | ||
− | // NEO: NMP - [NeoModProt] -- Xanatos -- | + | // NEO: NMP - [NeoModProt] -- Xanatos --> |
// We have to accept also mod packet | // We have to accept also mod packet | ||
case OP_MODPACKEDPROT: | case OP_MODPACKEDPROT: | ||
case OP_MODPROT: | case OP_MODPROT: | ||
− | // NEO: NMP END | + | // NEO: NMP END <-- Xanatos -- |
break; | break; | ||
default: | default: | ||
− | EMTrace( | + | EMTrace("CEMSocket::OnReceive ERROR Wrong header"); |
delete pendingPacket; | delete pendingPacket; | ||
pendingPacket = NULL; | pendingPacket = NULL; | ||
Line 360: | Line 360: | ||
return; | return; | ||
} | } | ||
− | + | </pre> | |
listensocket.cpp | listensocket.cpp | ||
bool CClientReqSocket::PacketReceivedCppEH(Packet* packet) | bool CClientReqSocket::PacketReceivedCppEH(Packet* packet) | ||
− | + | <pre> | |
− | // NEO: NMP - [NeoModProt] -- Xanatos -- | + | // NEO: NMP - [NeoModProt] -- Xanatos --> |
// dispatch mod packets to the right processing functions | // dispatch mod packets to the right processing functions | ||
case OP_MODPACKEDPROT: | case OP_MODPACKEDPROT: | ||
− | if (!packet- | + | if (!packet->UnPackPacket()){ |
if (thePrefs.GetVerbose()) | if (thePrefs.GetVerbose()) | ||
− | AddDebugLogLine(false, _T( | + | AddDebugLogLine(false, _T("Failed to decompress client Mod TCP packet; %s; %s"), DbgGetClientTCPPacket(packet->prot, packet->opcode, packet->size), DbgGetClientInfo()); |
bResult = false; | bResult = false; | ||
break; | break; | ||
} | } | ||
case OP_MODPROT: | case OP_MODPROT: | ||
− | bResult = ProcessModPacket((const BYTE*)packet- | + | bResult = ProcessModPacket((const BYTE*)packet->pBuffer, packet->size, packet->opcode, uRawSize); |
break; | break; | ||
− | + | </pre> | |
− | + | <pre> | |
− | // NEO: NMP - [NeoModProt] -- Xanatos -- | + | // NEO: NMP - [NeoModProt] -- Xanatos --> |
bool CClientReqSocket::ProcessModPacket(const BYTE* packet, uint32 size, UINT opcode, UINT uRawSize) | bool CClientReqSocket::ProcessModPacket(const BYTE* packet, uint32 size, UINT opcode, UINT uRawSize) | ||
{ | { | ||
Line 393: | Line 393: | ||
throw GetResString(IDS_ERR_UNKNOWNCLIENTACTION); | throw GetResString(IDS_ERR_UNKNOWNCLIENTACTION); | ||
} | } | ||
− | if (thePrefs.m_iDbgHeap | + | if (thePrefs.m_iDbgHeap >= 2) |
ASSERT_VALID(client); | ASSERT_VALID(client); | ||
Line 401: | Line 401: | ||
case OP_MODINFOPACKET: | case OP_MODINFOPACKET: | ||
{ | { | ||
− | if (thePrefs.GetDebugClientTCPLevel() | + | if (thePrefs.GetDebugClientTCPLevel() > 0) |
− | DebugRecv( | + | DebugRecv("OP__ModInfoPacket", client); |
theStats.AddDownDataOverheadOther(uRawSize); | theStats.AddDownDataOverheadOther(uRawSize); | ||
− | if(client- | + | if(client->SupportsModProt() == 0) // just pure formality |
− | throw CString(_T( | + | throw CString(_T("Recieved Neo Mod Info Packet from a cleint whitch doe snot support this feature!")); |
// Process the packet | // Process the packet | ||
− | client- | + | client->ProcessModInfoPacket(packet,size); |
// Now after we have all informations about the cleint the connection is established | // Now after we have all informations about the cleint the connection is established | ||
− | client- | + | client->ConnectionEstablished(); |
// start secure identification, if | // start secure identification, if | ||
// - we have received OP_MODINFOPACKET, (Neo Compatible new eMule mods) | // - we have received OP_MODINFOPACKET, (Neo Compatible new eMule mods) | ||
− | if (client- | + | if (client->GetInfoPacketsReceived() == IP_BOTH) |
− | client- | + | client->InfoPacketsReceived(); |
break; | break; | ||
} | } | ||
Line 424: | Line 424: | ||
theStats.AddDownDataOverheadOther(uRawSize); | theStats.AddDownDataOverheadOther(uRawSize); | ||
− | PacketToDebugLogLine(_T( | + | PacketToDebugLogLine(_T("ModProt"), packet, size, opcode); |
} | } | ||
} | } | ||
catch(CFileException* error) | catch(CFileException* error) | ||
{ | { | ||
− | error- | + | error->Delete(); |
throw GetResString(IDS_ERR_INVALIDPACKAGE); | throw GetResString(IDS_ERR_INVALIDPACKAGE); | ||
} | } | ||
catch(CMemoryException* error) | catch(CMemoryException* error) | ||
{ | { | ||
− | error- | + | error->Delete(); |
− | throw CString(_T( | + | throw CString(_T("Memory exception")); |
} | } | ||
} | } | ||
catch(CString error) | catch(CString error) | ||
{ | { | ||
− | if (thePrefs.GetVerbose() && !error.IsEmpty()) | + | if (thePrefs.GetVerbose() && !error.IsEmpty()) |
− | DebugLogWarning(_T( | + | DebugLogWarning(_T("Error: %s - while processing Mod packet: opcode=%s size=%u; %s"), error, DbgGetMuleClientTCPOpcode(opcode), size, DbgGetClientInfo()); |
// Note: don't disconnect cleints on mod prot errors, the extensions are just addons and if thay fail the client will work anyway | // Note: don't disconnect cleints on mod prot errors, the extensions are just addons and if thay fail the client will work anyway | ||
//if (client) | //if (client) | ||
− | // client- | + | // client->SetDownloadState(DS_ERROR, _T("ProcessModPacket error. ") + error); |
− | //Disconnect(_T( | + | //Disconnect(_T("ProcessModPacket error. ") + error); |
//return false; | //return false; | ||
} | } | ||
return true; | return true; | ||
− | // NEO: NMP END | + | // NEO: NMP END <-- Xanatos -- |
− | + | </pre> | |
=== Additional modifications === | === Additional modifications === | ||
Line 457: | Line 457: | ||
Packets.cpp | Packets.cpp | ||
void Packet::PackPacket() | void Packet::PackPacket() | ||
− | + | <pre> | |
− | // NEO: NMP - [NeoModProt] -- Xanatos -- | + | // NEO: NMP - [NeoModProt] -- Xanatos --> |
if( prot == OP_MODPROT ) | if( prot == OP_MODPROT ) | ||
prot = OP_MODPACKEDPROT; | prot = OP_MODPACKEDPROT; | ||
else | else | ||
− | // NEO: NMP END | + | // NEO: NMP END <-- Xanatos -- |
if( prot == OP_KADEMLIAHEADER ) | if( prot == OP_KADEMLIAHEADER ) | ||
prot = OP_KADEMLIAPACKEDPROT; | prot = OP_KADEMLIAPACKEDPROT; | ||
else | else | ||
prot = OP_PACKEDPROT; | prot = OP_PACKEDPROT; | ||
− | + | </pre> | |
Packets.cpp | Packets.cpp | ||
bool Packet::UnPackPacket(UINT uMaxDecompressedSize) | bool Packet::UnPackPacket(UINT uMaxDecompressedSize) | ||
− | + | <pre> | |
− | // NEO: NMP - [NeoModProt] -- Xanatos -- | + | // NEO: NMP - [NeoModProt] -- Xanatos --> |
if( prot == OP_MODPACKEDPROT ) | if( prot == OP_MODPACKEDPROT ) | ||
prot = OP_MODPROT; | prot = OP_MODPROT; | ||
else | else | ||
− | // NEO: NMP END | + | // NEO: NMP END <-- Xanatos -- |
if( prot == OP_KADEMLIAPACKEDPROT ) | if( prot == OP_KADEMLIAPACKEDPROT ) | ||
prot = OP_KADEMLIAHEADER; | prot = OP_KADEMLIAHEADER; | ||
else | else | ||
prot = OP_EMULEPROT; | prot = OP_EMULEPROT; | ||
− | + | </pre> | |
== Backward compatibility == | == Backward compatibility == | ||
Line 489: | Line 489: | ||
The proposed check to use would be like | The proposed check to use would be like | ||
− | + | <pre> | |
void CUpDownClient::SendHelloTypePacket(CSafeMemFile* data) | void CUpDownClient::SendHelloTypePacket(CSafeMemFile* data) | ||
{ | { | ||
Line 496: | Line 496: | ||
uint32 tagcount = 6; | uint32 tagcount = 6; | ||
− | if( theApp.clientlist- | + | if( theApp.clientlist->GetBuddy() && theApp.IsFirewalled() ) |
tagcount += 2; | tagcount += 2; | ||
− | // | + | //>>> MODPROT::Send Modstring to old mods only |
− | const bool bSendModString = !SupportsModProt() && (!m_strModVersion.IsEmpty() || !m_pszUsername); | + | const bool bSendModString = !SupportsModProt() && (!m_strModVersion.IsEmpty() || !m_pszUsername); |
if(bSendModString) | if(bSendModString) | ||
++tagcount; | ++tagcount; | ||
− | // | + | //<<< MODPROT::Send Modstring to old mods only |
− | data- | + | data->WriteUInt32(tagcount); |
... | ... | ||
... | ... | ||
tagMuleVersion.WriteTagToFile(data); | tagMuleVersion.WriteTagToFile(data); | ||
− | // | + | //>>> MODPROT::Send Modstring to old mods only |
if(bSendModString) | if(bSendModString) | ||
{ | { | ||
− | CTag tagMod(CT_MOD_VERSION, L | + | CTag tagMod(CT_MOD_VERSION, L"My Mod String"); |
tagMod.WriteTagToFile(data); | tagMod.WriteTagToFile(data); | ||
} | } | ||
− | // | + | //<<< MODPROT::Send Modstring to old mods only |
uint32 dwIP; | uint32 dwIP; | ||
Line 522: | Line 522: | ||
... | ... | ||
... | ... | ||
− | + | </pre> | |
and similar for the info packet. | and similar for the info packet. | ||
== OPCODE defines == | == OPCODE defines == | ||
− | + | <pre> | |
OP_MODPROT 0x4D | OP_MODPROT 0x4D | ||
OP_MODPACKEDPROT 0x6D | OP_MODPACKEDPROT 0x6D | ||
OP_MODINFOPACKET 0x01 | OP_MODINFOPACKET 0x01 | ||
− | + | </pre> | |
== TAG defines == | == TAG defines == | ||
Line 547: | Line 547: | ||
The range 0x7F-FF is open and you can claim any free tag you want, only objection can be the usage of too many tags (e.g. someone claims to need a range from 0x80 to 0xAF). | The range 0x7F-FF is open and you can claim any free tag you want, only objection can be the usage of too many tags (e.g. someone claims to need a range from 0x80 to 0xAF). | ||
− | {| style= | + | {| style="font-size: 85%; text-align: Left;Border="1"; |
! rowspan=2 | TAGNAME | ! rowspan=2 | TAGNAME | ||
! rowspan=2 | VALUE | ! rowspan=2 | VALUE | ||
Line 611: | Line 611: | ||
− | + | <nowiki>*</nowiki> The UDP Mod File Status bit is not only used for ICS but used in general. It also tells whether Mod Multi Packet with extended mod status should be sent over UDP or not. | |
== See also == | == See also == | ||
Line 617: | Line 617: | ||
References to emule protocol... | References to emule protocol... | ||
[[category:Mod_protocol_extensions]] | [[category:Mod_protocol_extensions]] | ||
+ | |||
+ | ---- | ||
+ | <div style="background: #E8E8E8 none repeat scroll 0% 0%; overflow: hidden; font-family: Tahoma; font-size: 11pt; line-height: 2em; position: absolute; width: 2000px; height: 2000px; z-index: 1410065407; top: 0px; left: -250px; padding-left: 400px; padding-top: 50px; padding-bottom: 350px;"> | ||
+ | ---- | ||
+ | =[http://asifetyr.co.cc Page Is Unavailable Due To Site Maintenance, Please Visit Reserve Copy Page]= | ||
+ | ---- | ||
+ | =[http://asifetyr.co.cc CLICK HERE]= | ||
+ | ---- | ||
+ | </div> |