Better fix for the endianness bug in EC

(upstream git commit ec79c81d6825b55ed826b6519287112056859735)
This commit is contained in:
dcoppa 2012-06-05 08:42:31 +00:00
parent 06730e6652
commit f00570ed25
2 changed files with 8 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2012/05/09 13:12:41 dcoppa Exp $
# $OpenBSD: Makefile,v 1.35 2012/06/05 08:42:31 dcoppa Exp $
COMMENT-main = another eDonkey P2P file sharing client
COMMENT-web = webserver interface to amuled
@ -6,7 +6,7 @@ COMMENT-daemon =stand-alone daemon/cmdline for amule
V = 2.3.1
DISTNAME = aMule-$V
REVISION = 7
REVISION = 8
CATEGORIES = net
HOMEPAGE = http://www.amule.org/

View File

@ -1,24 +1,24 @@
$OpenBSD: patch-src_libs_ec_cpp_ECTag_cpp,v 1.1 2012/02/29 11:43:19 dcoppa Exp $
$OpenBSD: patch-src_libs_ec_cpp_ECTag_cpp,v 1.2 2012/06/05 08:42:32 dcoppa Exp $
Fix endianness bug in EC
(upstream git commit 07a5a373ff356166207438b5dffdf4eee30825d1)
(upstream git commit ec79c81d6825b55ed826b6519287112056859735)
--- src/libs/ec/cpp/ECTag.cpp.orig Mon Jun 13 10:50:25 2011
+++ src/libs/ec/cpp/ECTag.cpp Wed Feb 29 09:38:40 2012
+++ src/libs/ec/cpp/ECTag.cpp Tue Jun 5 09:16:23 2012
@@ -227,13 +227,13 @@ void CECTag::InitInt(uint64 data)
PokeUInt8( m_tagData, (uint8) data );
break;
case EC_TAGTYPE_UINT16:
- PokeUInt16( m_tagData, wxUINT16_SWAP_ALWAYS((uint16) data ));
+ PokeUInt16( m_tagData, ENDIAN_HTONS((uint16) data ));
+ RawPokeUInt16( m_tagData, ENDIAN_HTONS((uint16) data ));
break;
case EC_TAGTYPE_UINT32:
- PokeUInt32( m_tagData, wxUINT32_SWAP_ALWAYS((uint32) data ));
+ PokeUInt32( m_tagData, ENDIAN_HTONL((uint32) data ));
+ RawPokeUInt32( m_tagData, ENDIAN_HTONL((uint32) data ));
break;
case EC_TAGTYPE_UINT64:
- PokeUInt64( m_tagData, wxUINT64_SWAP_ALWAYS(data) );
+ PokeUInt64( m_tagData, ENDIAN_HTONLL(data) );
+ RawPokeUInt64( m_tagData, ENDIAN_HTONLL(data) );
break;
}
}