From 8e3f7417bb407c56a7d9ad36353291b0e04a7413 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Fri, 2 Apr 2010 17:16:09 +0000
Subject: [PATCH] Upstream tarball 10068

---
 .svn-revision                     | 2 +-
 src/ExternalConn.cpp              | 6 +++---
 src/libs/ec/cpp/ECSocket.cpp      | 4 ++--
 src/libs/ec/cpp/ECSocket.h        | 2 +-
 src/libs/ec/cpp/RemoteConnect.cpp | 4 ++--
 src/libs/ec/cpp/RemoteConnect.h   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 2fe34dba..5dbaa273 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-10067
+10068
diff --git a/src/ExternalConn.cpp b/src/ExternalConn.cpp
index 6bcb62ab..4bfd8cc0 100644
--- a/src/ExternalConn.cpp
+++ b/src/ExternalConn.cpp
@@ -199,7 +199,7 @@ public:
 	CECServerSocket(ECNotifier *notifier);
 	virtual ~CECServerSocket();
 
-	virtual const CECPacket *OnPacketReceived(const CECPacket *packet);
+	virtual const CECPacket *OnPacketReceived(const CECPacket *packet, uint32 trueSize);
 	virtual void OnLost();
 
 	virtual void WriteDoneAndQueueEmpty();
@@ -242,9 +242,9 @@ CECServerSocket::~CECServerSocket()
 }
 
 
-const CECPacket *CECServerSocket::OnPacketReceived(const CECPacket *packet)
+const CECPacket *CECServerSocket::OnPacketReceived(const CECPacket *packet, uint32 trueSize)
 {
-	packet->DebugPrint(true);
+	packet->DebugPrint(true, trueSize);
 
 	const CECPacket *reply = NULL;
 
diff --git a/src/libs/ec/cpp/ECSocket.cpp b/src/libs/ec/cpp/ECSocket.cpp
index 2deec9d6..11d8f003 100644
--- a/src/libs/ec/cpp/ECSocket.cpp
+++ b/src/libs/ec/cpp/ECSocket.cpp
@@ -436,7 +436,7 @@ void CECSocket::OnInput()
 			std::auto_ptr<const CECPacket> packet(ReadPacket());
 			m_curr_rx_data->Rewind();
 			if (packet.get()) {
-				std::auto_ptr<const CECPacket> reply(OnPacketReceived(packet.get()));
+				std::auto_ptr<const CECPacket> reply(OnPacketReceived(packet.get(), m_curr_packet_len));
 				if (reply.get()) {
 					SendPacket(reply.get());
 				}
@@ -828,7 +828,7 @@ const CECPacket *CECSocket::ReadPacket()
 	return packet;
 }
 
-const CECPacket *CECSocket::OnPacketReceived(const CECPacket *)
+const CECPacket *CECSocket::OnPacketReceived(const CECPacket *, uint32)
 {
 	return 0;
 }
diff --git a/src/libs/ec/cpp/ECSocket.h b/src/libs/ec/cpp/ECSocket.h
index 29d7dfa7..765a6c7b 100644
--- a/src/libs/ec/cpp/ECSocket.h
+++ b/src/libs/ec/cpp/ECSocket.h
@@ -150,7 +150,7 @@ public:
 	 * @note This function won't be called for packets received via the
 	 * SendRecvPacket() function.
 	 */
-	virtual const CECPacket *OnPacketReceived(const CECPacket *packet);
+	virtual const CECPacket *OnPacketReceived(const CECPacket *packet, uint32 trueSize);
 
 	/**
 	 * Get a message describing the error.
diff --git a/src/libs/ec/cpp/RemoteConnect.cpp b/src/libs/ec/cpp/RemoteConnect.cpp
index 83849467..a0623ee8 100644
--- a/src/libs/ec/cpp/RemoteConnect.cpp
+++ b/src/libs/ec/cpp/RemoteConnect.cpp
@@ -162,11 +162,11 @@ void CRemoteConnect::OnLost() {
 	}
 }
 
-const CECPacket *CRemoteConnect::OnPacketReceived(const CECPacket *packet)
+const CECPacket *CRemoteConnect::OnPacketReceived(const CECPacket *packet, uint32 trueSize)
 {
 	CECPacket *next_packet = 0;
 	m_req_count--;
-	packet->DebugPrint(true);
+	packet->DebugPrint(true, trueSize);
 	switch(m_ec_state) {
 		case EC_REQ_SENT:
 			if (ProcessAuthPacket(packet)) {
diff --git a/src/libs/ec/cpp/RemoteConnect.h b/src/libs/ec/cpp/RemoteConnect.h
index 753c4ebe..d708574d 100644
--- a/src/libs/ec/cpp/RemoteConnect.h
+++ b/src/libs/ec/cpp/RemoteConnect.h
@@ -386,7 +386,7 @@ public:
 	bool IsConnectedToLocalHost();
 
 private:
-	virtual const CECPacket *OnPacketReceived(const CECPacket *packet);
+	virtual const CECPacket *OnPacketReceived(const CECPacket *packet, uint32 trueSize);
 	bool ProcessAuthPacket(const CECPacket *reply);
 };
 
-- 
2.11.4.GIT