Revision: 76358 http://trac.macports.org/changeset/76358 Author: ryandesign@macports.org Date: 2011-02-20 14:49:48 -0800 (Sun, 20 Feb 2011) Log Message: ----------- libhsplasma: update to 804 Modified Paths: -------------- users/ryandesign/ports/devel/libhsplasma/Portfile users/ryandesign/ports/devel/libhsplasma/files/patch-endian.diff Modified: users/ryandesign/ports/devel/libhsplasma/Portfile =================================================================== --- users/ryandesign/ports/devel/libhsplasma/Portfile 2011-02-20 20:08:15 UTC (rev 76357) +++ users/ryandesign/ports/devel/libhsplasma/Portfile 2011-02-20 22:49:48 UTC (rev 76358) @@ -5,7 +5,7 @@ PortGroup cmake 1.0 name libhsplasma -version 0.0-798 +version 0.0-804 categories devel platforms darwin maintainers ryandesign @@ -21,7 +21,7 @@ fetch.type hg hg.url http://uru.zrax.net/hg/libhsplasma -hg.tag 51c5233d5049 +hg.tag e071371013ac depends_lib port:zlib \ port:jpeg \ Modified: users/ryandesign/ports/devel/libhsplasma/files/patch-endian.diff =================================================================== --- users/ryandesign/ports/devel/libhsplasma/files/patch-endian.diff 2011-02-20 20:08:15 UTC (rev 76357) +++ users/ryandesign/ports/devel/libhsplasma/files/patch-endian.diff 2011-02-20 22:49:48 UTC (rev 76358) @@ -1,5 +1,5 @@ ---- core/Sys/plUuid.cpp.orig Thu Nov 11 11:14:21 2010 -0800 -+++ core/Sys/plUuid.cpp Thu Nov 18 15:52:46 2010 -0600 +--- core/Sys/plUuid.cpp.orig Sun Feb 20 11:00:24 2011 -0800 ++++ core/Sys/plUuid.cpp Sun Feb 20 16:13:42 2011 -0600 @@ -69,6 +69,9 @@ fData1 = *(unsigned int* )(buffer ); fData2 = *(unsigned short*)(buffer + 4); @@ -23,88 +23,88 @@ memcpy(buffer + 8, fData4, 8); } ---- net/auth/pnAuthClient.cpp.orig Thu Nov 11 11:14:21 2010 -0800 -+++ net/auth/pnAuthClient.cpp Thu Nov 18 15:52:46 2010 -0600 +--- net/auth/pnAuthClient.cpp.orig Sun Feb 20 11:00:24 2011 -0800 ++++ net/auth/pnAuthClient.cpp Sun Feb 20 16:13:42 2011 -0600 @@ -64,6 +64,7 @@ - hsUint16 msgId; + uint16_t msgId; - sock->recv(&msgId, sizeof(hsUint16)); + sock->recv(&msgId, sizeof(uint16_t)); + msgId = LESWAP16(msgId); const pnNetMsg* msgDesc = GET_Auth2Cli(msgId); if (msgDesc == NULL) { plDebug::Error("Got invalid message ID (%u)", msgId); @@ -385,13 +386,13 @@ - hsUbyte connectHeader[51]; // ConnectHeader + AuthConnectHeader + uint8_t connectHeader[51]; // ConnectHeader + AuthConnectHeader /* Begin ConnectHeader */ - *(hsUbyte* )(connectHeader ) = kConnTypeCliToAuth; -- *(hsUint16*)(connectHeader + 1) = 31; -- *(hsUint32*)(connectHeader + 3) = fBuildId; -- *(hsUint32*)(connectHeader + 7) = fBuildType; -- *(hsUint32*)(connectHeader + 11) = fBranchId; -+ *(hsUint16*)(connectHeader + 1) = LESWAP16(31); -+ *(hsUint32*)(connectHeader + 3) = LESWAP32(fBuildId); -+ *(hsUint32*)(connectHeader + 7) = LESWAP32(fBuildType); -+ *(hsUint32*)(connectHeader + 11) = LESWAP32(fBranchId); + *(uint8_t* )(connectHeader ) = kConnTypeCliToAuth; +- *(uint16_t*)(connectHeader + 1) = 31; +- *(uint32_t*)(connectHeader + 3) = fBuildId; +- *(uint32_t*)(connectHeader + 7) = fBuildType; +- *(uint32_t*)(connectHeader + 11) = fBranchId; ++ *(uint16_t*)(connectHeader + 1) = LESWAP16(31); ++ *(uint32_t*)(connectHeader + 3) = LESWAP32(fBuildId); ++ *(uint32_t*)(connectHeader + 7) = LESWAP32(fBuildType); ++ *(uint32_t*)(connectHeader + 11) = LESWAP32(fBranchId); fProductId.write(connectHeader + 15); /* Begin AuthConnectHeader */ -- *(hsUint32*)(connectHeader + 31) = 20; -+ *(hsUint32*)(connectHeader + 31) = LESWAP32(20); +- *(uint32_t*)(connectHeader + 31) = 20; ++ *(uint32_t*)(connectHeader + 31) = LESWAP32(20); memset(connectHeader + 35, 0, 16); fSock->send(connectHeader, 51); @@ -439,6 +440,7 @@ } else if (msg == kNetCliSrv2CliError) { - hsUint32 errorCode; - fSock->recv(&errorCode, sizeof(hsUint32)); + uint32_t errorCode; + fSock->recv(&errorCode, sizeof(uint32_t)); + errorCode = LESWAP32(errorCode); delete fSock; fSock = NULL; plDebug::Error("Error connecting to Auth server: %s", ---- net/pnSocket.cpp.orig Thu Nov 11 11:14:21 2010 -0800 -+++ net/pnSocket.cpp Thu Nov 18 15:52:46 2010 -0600 -@@ -334,11 +334,11 @@ +--- net/pnSocket.cpp.orig Sun Feb 20 11:00:24 2011 -0800 ++++ net/pnSocket.cpp Sun Feb 20 16:13:42 2011 -0600 +@@ -338,11 +338,11 @@ } else if (size == 2) { - hsUint16 v; - sock->recv(&v, sizeof(hsUint16)); + uint16_t v; + sock->recv(&v, sizeof(uint16_t)); - data.fUint = v; + data.fUint = LESWAP16(v); } else if (size == 4) { - hsUint32 v; - sock->recv(&v, sizeof(hsUint32)); + uint32_t v; + sock->recv(&v, sizeof(uint32_t)); - data.fUint = v; + data.fUint = LESWAP32(v); } #ifdef COMMDEBUG -@@ -381,10 +381,10 @@ - *(hsUbyte*)buf = (hsUbyte)data.fUint; - buf += sizeof(hsUbyte); +@@ -385,10 +385,10 @@ + *(uint8_t*)buf = (uint8_t)data.fUint; + buf += sizeof(uint8_t); } else if (size == 2) { -- *(hsUint16*)buf = (hsUint16)data.fUint; -+ *(hsUint16*)buf = (hsUint16)LESWAP16(data.fUint); - buf += sizeof(hsUint16); +- *(uint16_t*)buf = (uint16_t)data.fUint; ++ *(uint16_t*)buf = (uint16_t)LESWAP16(data.fUint); + buf += sizeof(uint16_t); } else if (size == 4) { -- *(hsUint32*)buf = data.fUint; -+ *(hsUint32*)buf = LESWAP32(data.fUint); - buf += sizeof(hsUint32); +- *(uint32_t*)buf = data.fUint; ++ *(uint32_t*)buf = LESWAP32(data.fUint); + buf += sizeof(uint32_t); } -@@ -435,7 +435,7 @@ - size_t bufSize = sizeof(hsUint16) + NCMessageSize(data, msg); +@@ -439,7 +439,7 @@ + size_t bufSize = sizeof(uint16_t) + NCMessageSize(data, msg); unsigned char* buffer = new unsigned char[bufSize]; unsigned char* bp = buffer; -- *(hsUint16*)bp = msg->fMsgId; -+ *(hsUint16*)bp = LESWAP16(msg->fMsgId); - bp += sizeof(hsUint16); +- *(uint16_t*)bp = msg->fMsgId; ++ *(uint16_t*)bp = LESWAP16(msg->fMsgId); + bp += sizeof(uint16_t); unsigned int size = 0; -@@ -450,9 +450,13 @@ +@@ -454,9 +454,13 @@ case kFieldString: { - hsUint16 len = plwcslen(data[i].fString); -- *(hsUint16*)bp = len; -+ *(hsUint16*)bp = LESWAP16(len); - bp += sizeof(hsUint16); + uint16_t len = plwcslen(data[i].fString); +- *(uint16_t*)bp = len; ++ *(uint16_t*)bp = LESWAP16(len); + bp += sizeof(uint16_t); memcpy(bp, data[i].fString, len * sizeof(pl_wchar_t)); +#ifdef WORDS_BIGENDIAN + for (size_t j=0; j<len; j++) @@ -113,19 +113,19 @@ bp += len * sizeof(pl_wchar_t); #ifdef COMMDEBUG plDebug::Debug(" -> Str: %s", plString(data[i].fString, len).cstr()); -@@ -462,7 +466,7 @@ +@@ -466,7 +470,7 @@ case kFieldVarCount: size = field->fSize; count = data[i].fUint; -- *(hsUint32*)bp = count; -+ *(hsUint32*)bp = LESWAP32(count); - bp += sizeof(hsUint32); +- *(uint32_t*)bp = count; ++ *(uint32_t*)bp = LESWAP32(count); + bp += sizeof(uint32_t); #ifdef COMMDEBUG plDebug::Debug(" -> Count: %d", count); -@@ -536,8 +540,13 @@ +@@ -540,8 +544,13 @@ { - hsUint16 len; - recv(&len, sizeof(hsUint16)); + uint16_t len; + recv(&len, sizeof(uint16_t)); + len = LESWAP16(len); pl_wchar_t* str = new pl_wchar_t[len + 1]; recv(str, len * sizeof(pl_wchar_t)); @@ -136,205 +136,205 @@ str[len] = 0; data[i].fString = str; #ifdef COMMDEBUG -@@ -548,7 +557,7 @@ +@@ -552,7 +561,7 @@ case kFieldVarCount: size = field->fSize; - recv(&count, sizeof(hsUint32)); + recv(&count, sizeof(uint32_t)); - data[i].fUint = count; + data[i].fUint = LESWAP32(count); #ifdef COMMDEBUG plDebug::Debug(" <- Count: %d", count); #endif ---- net/file/pnFileClient.cpp.orig Thu Nov 11 11:14:21 2010 -0800 -+++ net/file/pnFileClient.cpp Thu Nov 18 15:52:46 2010 -0600 +--- net/file/pnFileClient.cpp.orig Sun Feb 20 11:00:24 2011 -0800 ++++ net/file/pnFileClient.cpp Sun Feb 20 16:13:42 2011 -0600 @@ -115,6 +115,8 @@ sock->recv(&header.fMsgSize, sizeof(header.fMsgSize)); sock->recv(&header.fMsgId, sizeof(header.fMsgId)); + header.fMsgSize = LESWAP32(header.fMsgSize); + header.fMsgId = LESWAP32(header.fMsgId); - hsUbyte* msgbuf = new hsUbyte[header.fMsgSize - 8]; - hsUint32 read_data = 0; + uint8_t* msgbuf = new uint8_t[header.fMsgSize - 8]; + uint32_t read_data = 0; while (read_data < header.fMsgSize - 8) @@ -239,13 +241,13 @@ - hsUbyte connectHeader[43]; // ConnectHeader + FileConnectHeader + uint8_t connectHeader[43]; // ConnectHeader + FileConnectHeader /* Begin ConnectHeader */ - *(hsUbyte* )(connectHeader ) = kConnTypeCliToFile; -- *(hsUint16*)(connectHeader + 1) = 31; -+ *(hsUint16*)(connectHeader + 1) = LESWAP16(31); - *(hsUint32*)(connectHeader + 3) = 0; -- *(hsUint32*)(connectHeader + 7) = fBuildType; -- *(hsUint32*)(connectHeader + 11) = fBranchId; -+ *(hsUint32*)(connectHeader + 7) = LESWAP32(fBuildType); -+ *(hsUint32*)(connectHeader + 11) = LESWAP32(fBranchId); + *(uint8_t* )(connectHeader ) = kConnTypeCliToFile; +- *(uint16_t*)(connectHeader + 1) = 31; ++ *(uint16_t*)(connectHeader + 1) = LESWAP16(31); + *(uint32_t*)(connectHeader + 3) = 0; +- *(uint32_t*)(connectHeader + 7) = fBuildType; +- *(uint32_t*)(connectHeader + 11) = fBranchId; ++ *(uint32_t*)(connectHeader + 7) = LESWAP32(fBuildType); ++ *(uint32_t*)(connectHeader + 11) = LESWAP32(fBranchId); fProductId.write(connectHeader + 15); /* Begin FileConnectHeader */ -- *(hsUint32*)(connectHeader + 31) = 12; -+ *(hsUint32*)(connectHeader + 31) = LESWAP32(12); - *(hsUint32*)(connectHeader + 35) = 0; - *(hsUint32*)(connectHeader + 39) = 0; +- *(uint32_t*)(connectHeader + 31) = 12; ++ *(uint32_t*)(connectHeader + 31) = LESWAP32(12); + *(uint32_t*)(connectHeader + 35) = 0; + *(uint32_t*)(connectHeader + 39) = 0; fSock->send(connectHeader, 43); @@ -269,9 +271,9 @@ - void pnFileClient::sendPingRequest(hsUint32 pingTimeMs) + void pnFileClient::sendPingRequest(uint32_t pingTimeMs) { - hsUbyte msgbuf[12]; -- *(hsUint32*)(msgbuf ) = 12; // Msg size -- *(hsUint32*)(msgbuf + 4) = kCli2File_PingRequest; // Msg ID -- *(hsUint32*)(msgbuf + 8) = pingTimeMs; // Ping time -+ *(hsUint32*)(msgbuf ) = LESWAP32(12); // Msg size -+ *(hsUint32*)(msgbuf + 4) = LESWAP32(kCli2File_PingRequest); // Msg ID -+ *(hsUint32*)(msgbuf + 8) = LESWAP32(pingTimeMs); // Ping time + uint8_t msgbuf[12]; +- *(uint32_t*)(msgbuf ) = 12; // Msg size +- *(uint32_t*)(msgbuf + 4) = kCli2File_PingRequest; // Msg ID +- *(uint32_t*)(msgbuf + 8) = pingTimeMs; // Ping time ++ *(uint32_t*)(msgbuf ) = LESWAP32(12); // Msg size ++ *(uint32_t*)(msgbuf + 4) = LESWAP32(kCli2File_PingRequest); // Msg ID ++ *(uint32_t*)(msgbuf + 8) = LESWAP32(pingTimeMs); // Ping time fSock->send(msgbuf, 12); } @@ -279,9 +281,9 @@ { - hsUint32 transId = nextTransId(); - hsUbyte msgbuf[12]; -- *(hsUint32*)(msgbuf ) = 12; // Msg size -- *(hsUint32*)(msgbuf + 4) = kCli2File_BuildIdRequest; // Msg ID -- *(hsUint32*)(msgbuf + 8) = transId; // Trans ID -+ *(hsUint32*)(msgbuf ) = LESWAP32(12); // Msg size -+ *(hsUint32*)(msgbuf + 4) = LESWAP32(kCli2File_BuildIdRequest); // Msg ID -+ *(hsUint32*)(msgbuf + 8) = LESWAP32(transId); // Trans ID + uint32_t transId = nextTransId(); + uint8_t msgbuf[12]; +- *(uint32_t*)(msgbuf ) = 12; // Msg size +- *(uint32_t*)(msgbuf + 4) = kCli2File_BuildIdRequest; // Msg ID +- *(uint32_t*)(msgbuf + 8) = transId; // Trans ID ++ *(uint32_t*)(msgbuf ) = LESWAP32(12); // Msg size ++ *(uint32_t*)(msgbuf + 4) = LESWAP32(kCli2File_BuildIdRequest); // Msg ID ++ *(uint32_t*)(msgbuf + 8) = LESWAP32(transId); // Trans ID fSock->send(msgbuf, 12); return transId; } @@ -293,12 +295,12 @@ - hsUint32 transId = nextTransId(); - hsUbyte msgbuf[536]; -- *(hsUint32*)(msgbuf ) = 536; // Msg size -- *(hsUint32*)(msgbuf + 4) = kCli2File_ManifestRequest; // Msg ID -- *(hsUint32*)(msgbuf + 8) = transId; // Trans ID -+ *(hsUint32*)(msgbuf ) = LESWAP32(536); // Msg size -+ *(hsUint32*)(msgbuf + 4) = LESWAP32(kCli2File_ManifestRequest); // Msg ID -+ *(hsUint32*)(msgbuf + 8) = LESWAP32(transId); // Trans ID + uint32_t transId = nextTransId(); + uint8_t msgbuf[536]; +- *(uint32_t*)(msgbuf ) = 536; // Msg size +- *(uint32_t*)(msgbuf + 4) = kCli2File_ManifestRequest; // Msg ID +- *(uint32_t*)(msgbuf + 8) = transId; // Trans ID ++ *(uint32_t*)(msgbuf ) = LESWAP32(536); // Msg size ++ *(uint32_t*)(msgbuf + 4) = LESWAP32(kCli2File_ManifestRequest); // Msg ID ++ *(uint32_t*)(msgbuf + 8) = LESWAP32(transId); // Trans ID memcpy(msgbuf + 12, wgroup.data(), (len >= 260 ? 259 : len) * sizeof(pl_wchar_t)); - *(pl_wchar_t*)(msgbuf + 530) = 0; // Nul terminator -- *(hsUint32*)(msgbuf + 532) = buildId; // Build ID +- *(uint32_t*)(msgbuf + 532) = buildId; // Build ID + *(pl_wchar_t*)(msgbuf + 530) = 0; // Nul terminator -+ *(hsUint32*)(msgbuf + 532) = LESWAP32(buildId); // Build ID ++ *(uint32_t*)(msgbuf + 532) = LESWAP32(buildId); // Build ID fSock->send(msgbuf, 536); return transId; } @@ -310,12 +312,12 @@ - hsUint32 transId = nextTransId(); - hsUbyte msgbuf[536]; -- *(hsUint32*)(msgbuf ) = 536; // Msg size -- *(hsUint32*)(msgbuf + 4) = kCli2File_FileDownloadRequest; // Msg ID -- *(hsUint32*)(msgbuf + 8) = transId; // Trans ID -+ *(hsUint32*)(msgbuf ) = LESWAP32(536); // Msg size -+ *(hsUint32*)(msgbuf + 4) = LESWAP32(kCli2File_FileDownloadRequest); // Msg ID -+ *(hsUint32*)(msgbuf + 8) = LESWAP32(transId); // Trans ID + uint32_t transId = nextTransId(); + uint8_t msgbuf[536]; +- *(uint32_t*)(msgbuf ) = 536; // Msg size +- *(uint32_t*)(msgbuf + 4) = kCli2File_FileDownloadRequest; // Msg ID +- *(uint32_t*)(msgbuf + 8) = transId; // Trans ID ++ *(uint32_t*)(msgbuf ) = LESWAP32(536); // Msg size ++ *(uint32_t*)(msgbuf + 4) = LESWAP32(kCli2File_FileDownloadRequest); // Msg ID ++ *(uint32_t*)(msgbuf + 8) = LESWAP32(transId); // Trans ID memcpy(msgbuf + 12, wfilename.data(), (len >= 260 ? 259 : len) * sizeof(pl_wchar_t)); - *(pl_wchar_t*)(msgbuf + 530) = 0; // Nul terminator -- *(hsUint32*)(msgbuf + 532) = buildId; // Build ID +- *(uint32_t*)(msgbuf + 532) = buildId; // Build ID + *(pl_wchar_t*)(msgbuf + 530) = 0; // Nul terminator -+ *(hsUint32*)(msgbuf + 532) = LESWAP32(buildId); // Build ID ++ *(uint32_t*)(msgbuf + 532) = LESWAP32(buildId); // Build ID fSock->send(msgbuf, 536); return transId; } @@ -323,20 +325,20 @@ - void pnFileClient::sendManifestEntryAck(hsUint32 transId, hsUint32 readerId) + void pnFileClient::sendManifestEntryAck(uint32_t transId, uint32_t readerId) { - hsUbyte msgbuf[16]; -- *(hsUint32*)(msgbuf ) = 16; // Msg size -- *(hsUint32*)(msgbuf + 4) = kCli2File_ManifestEntryAck; // Msg ID -- *(hsUint32*)(msgbuf + 8) = transId; // Trans ID -- *(hsUint32*)(msgbuf + 12) = readerId; // Reader ID -+ *(hsUint32*)(msgbuf ) = LESWAP32(16); // Msg size -+ *(hsUint32*)(msgbuf + 4) = LESWAP32(kCli2File_ManifestEntryAck); // Msg ID -+ *(hsUint32*)(msgbuf + 8) = LESWAP32(transId); // Trans ID -+ *(hsUint32*)(msgbuf + 12) = LESWAP32(readerId); // Reader ID + uint8_t msgbuf[16]; +- *(uint32_t*)(msgbuf ) = 16; // Msg size +- *(uint32_t*)(msgbuf + 4) = kCli2File_ManifestEntryAck; // Msg ID +- *(uint32_t*)(msgbuf + 8) = transId; // Trans ID +- *(uint32_t*)(msgbuf + 12) = readerId; // Reader ID ++ *(uint32_t*)(msgbuf ) = LESWAP32(16); // Msg size ++ *(uint32_t*)(msgbuf + 4) = LESWAP32(kCli2File_ManifestEntryAck); // Msg ID ++ *(uint32_t*)(msgbuf + 8) = LESWAP32(transId); // Trans ID ++ *(uint32_t*)(msgbuf + 12) = LESWAP32(readerId); // Reader ID fSock->send(msgbuf, 16); } - void pnFileClient::sendFileDownloadChunkAck(hsUint32 transId, hsUint32 readerId) + void pnFileClient::sendFileDownloadChunkAck(uint32_t transId, uint32_t readerId) { - hsUbyte msgbuf[16]; -- *(hsUint32*)(msgbuf ) = 16; // Msg size -- *(hsUint32*)(msgbuf + 4) = kCli2File_FileDownloadChunkAck; // Msg ID -- *(hsUint32*)(msgbuf + 8) = transId; // Trans ID -- *(hsUint32*)(msgbuf + 12) = readerId; // Reader ID -+ *(hsUint32*)(msgbuf ) = LESWAP32(16); // Msg size -+ *(hsUint32*)(msgbuf + 4) = LESWAP32(kCli2File_FileDownloadChunkAck); // Msg ID -+ *(hsUint32*)(msgbuf + 8) = LESWAP32(transId); // Trans ID -+ *(hsUint32*)(msgbuf + 12) = LESWAP32(readerId); // Reader ID + uint8_t msgbuf[16]; +- *(uint32_t*)(msgbuf ) = 16; // Msg size +- *(uint32_t*)(msgbuf + 4) = kCli2File_FileDownloadChunkAck; // Msg ID +- *(uint32_t*)(msgbuf + 8) = transId; // Trans ID +- *(uint32_t*)(msgbuf + 12) = readerId; // Reader ID ++ *(uint32_t*)(msgbuf ) = LESWAP32(16); // Msg size ++ *(uint32_t*)(msgbuf + 4) = LESWAP32(kCli2File_FileDownloadChunkAck); // Msg ID ++ *(uint32_t*)(msgbuf + 8) = LESWAP32(transId); // Trans ID ++ *(uint32_t*)(msgbuf + 12) = LESWAP32(readerId); // Reader ID fSock->send(msgbuf, 16); } ---- net/game/pnGameClient.cpp.orig Thu Nov 11 11:14:21 2010 -0800 -+++ net/game/pnGameClient.cpp Thu Nov 18 15:52:46 2010 -0600 +--- net/game/pnGameClient.cpp.orig Sun Feb 20 11:00:24 2011 -0800 ++++ net/game/pnGameClient.cpp Sun Feb 20 16:13:42 2011 -0600 @@ -35,6 +35,7 @@ - hsUint16 msgId; + uint16_t msgId; - sock->recv(&msgId, sizeof(hsUint16)); + sock->recv(&msgId, sizeof(uint16_t)); + msgId = LESWAP16(msgId); const pnNetMsg* msgDesc = GET_Game2Cli(msgId); if (msgDesc == NULL) { plDebug::Error("Got invalid message ID (%u)", msgId); @@ -153,13 +154,13 @@ - hsUbyte connectHeader[67]; // ConnectHeader + GameConnectHeader + uint8_t connectHeader[67]; // ConnectHeader + GameConnectHeader /* Begin ConnectHeader */ - *(hsUbyte* )(connectHeader ) = kConnTypeCliToGame; -- *(hsUint16*)(connectHeader + 1) = 31; -- *(hsUint32*)(connectHeader + 3) = fBuildId; -- *(hsUint32*)(connectHeader + 7) = fBuildType; -- *(hsUint32*)(connectHeader + 11) = fBranchId; -+ *(hsUint16*)(connectHeader + 1) = LESWAP16(31); -+ *(hsUint32*)(connectHeader + 3) = LESWAP32(fBuildId); -+ *(hsUint32*)(connectHeader + 7) = LESWAP32(fBuildType); -+ *(hsUint32*)(connectHeader + 11) = LESWAP32(fBranchId); + *(uint8_t* )(connectHeader ) = kConnTypeCliToGame; +- *(uint16_t*)(connectHeader + 1) = 31; +- *(uint32_t*)(connectHeader + 3) = fBuildId; +- *(uint32_t*)(connectHeader + 7) = fBuildType; +- *(uint32_t*)(connectHeader + 11) = fBranchId; ++ *(uint16_t*)(connectHeader + 1) = LESWAP16(31); ++ *(uint32_t*)(connectHeader + 3) = LESWAP32(fBuildId); ++ *(uint32_t*)(connectHeader + 7) = LESWAP32(fBuildType); ++ *(uint32_t*)(connectHeader + 11) = LESWAP32(fBranchId); fProductId.write(connectHeader + 15); /* Begin GameConnectHeader */ -- *(hsUint32*)(connectHeader + 31) = 36; -+ *(hsUint32*)(connectHeader + 31) = LESWAP32(36); +- *(uint32_t*)(connectHeader + 31) = 36; ++ *(uint32_t*)(connectHeader + 31) = LESWAP32(36); fAccountId.write(connectHeader + 35); fAgeId.write(connectHeader + 51); fSock->send(connectHeader, 67); @@ -208,6 +209,7 @@ } else if (msg == kNetCliSrv2CliError) { - hsUint32 errorCode; - fSock->recv(&errorCode, sizeof(hsUint32)); + uint32_t errorCode; + fSock->recv(&errorCode, sizeof(uint32_t)); + errorCode = LESWAP32(errorCode); delete fSock; fSock = NULL; plDebug::Error("Error connecting to Game server: %s", ---- net/gate/pnGateKeeperClient.cpp.orig Thu Nov 11 11:14:21 2010 -0800 -+++ net/gate/pnGateKeeperClient.cpp Thu Nov 18 15:52:46 2010 -0600 +--- net/gate/pnGateKeeperClient.cpp.orig Sun Feb 20 11:00:24 2011 -0800 ++++ net/gate/pnGateKeeperClient.cpp Sun Feb 20 16:13:42 2011 -0600 @@ -33,6 +33,7 @@ { - hsUint16 msgId; - sock->recv(&msgId, sizeof(hsUint16)); + uint16_t msgId; + sock->recv(&msgId, sizeof(uint16_t)); + msgId = LESWAP16(msgId); const pnNetMsg* msgDesc = GET_GateKeeper2Cli(msgId); if (msgDesc == NULL) { plDebug::Error("Got invalid message ID (%u)", msgId); @@ -121,13 +122,13 @@ - hsUbyte connectHeader[51]; // ConnectHeader + GateKeeperConnectHeader + uint8_t connectHeader[51]; // ConnectHeader + GateKeeperConnectHeader /* Begin ConnectHeader */ - *(hsUbyte* )(connectHeader ) = kConnTypeCliToGateKeeper; -- *(hsUint16*)(connectHeader + 1) = 31; -- *(hsUint32*)(connectHeader + 3) = fBuildId; -- *(hsUint32*)(connectHeader + 7) = fBuildType; -- *(hsUint32*)(connectHeader + 11) = fBranchId; -+ *(hsUint16*)(connectHeader + 1) = LESWAP16(31); -+ *(hsUint32*)(connectHeader + 3) = LESWAP32(fBuildId); -+ *(hsUint32*)(connectHeader + 7) = LESWAP32(fBuildType); -+ *(hsUint32*)(connectHeader + 11) = LESWAP32(fBranchId); + *(uint8_t* )(connectHeader ) = kConnTypeCliToGateKeeper; +- *(uint16_t*)(connectHeader + 1) = 31; +- *(uint32_t*)(connectHeader + 3) = fBuildId; +- *(uint32_t*)(connectHeader + 7) = fBuildType; +- *(uint32_t*)(connectHeader + 11) = fBranchId; ++ *(uint16_t*)(connectHeader + 1) = LESWAP16(31); ++ *(uint32_t*)(connectHeader + 3) = LESWAP32(fBuildId); ++ *(uint32_t*)(connectHeader + 7) = LESWAP32(fBuildType); ++ *(uint32_t*)(connectHeader + 11) = LESWAP32(fBranchId); fProductId.write(connectHeader + 15); /* Begin GateKeeperConnectHeader */ -- *(hsUint32*)(connectHeader + 31) = 20; -+ *(hsUint32*)(connectHeader + 31) = LESWAP32(20); +- *(uint32_t*)(connectHeader + 31) = 20; ++ *(uint32_t*)(connectHeader + 31) = LESWAP32(20); memset(connectHeader + 35, 0, 16); fSock->send(connectHeader, 51); @@ -175,6 +176,7 @@ } else if (msg == kNetCliSrv2CliError) { - hsUint32 errorCode; - fSock->recv(&errorCode, sizeof(hsUint32)); + uint32_t errorCode; + fSock->recv(&errorCode, sizeof(uint32_t)); + errorCode = LESWAP32(errorCode); delete fSock; fSock = NULL;
participants (1)
-
ryandesign＠macports.org