From 71ef7700a1cdfe31b6b5b0219984656a14ff163c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Sat, 19 May 2012 18:13:25 +0000
Subject: [PATCH] Added debugging, added missing (IMPORTANT) call of
resetSerialNumber()
---
application/hub/main/handler/chunks/class_ChunkHandler.php | 2 +-
.../hub/main/helper/connection/class_BaseConnectionHelper.php | 3 +++
.../hub/main/package/fragmenter/class_PackageFragmenter.php | 4 ++++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/application/hub/main/handler/chunks/class_ChunkHandler.php b/application/hub/main/handler/chunks/class_ChunkHandler.php
index f74cf99da..ca3fa8600 100644
--- a/application/hub/main/handler/chunks/class_ChunkHandler.php
+++ b/application/hub/main/handler/chunks/class_ChunkHandler.php
@@ -282,7 +282,7 @@ class ChunkHandler extends BaseHandler implements HandleableChunks, Registerable
$nextSerial = $this->getFragmenterInstance()->getNextHexSerialNumber();
// Debug output
- //* NOISY-DEBUG */ $this->debugOutput('CHUNK-HANDLER: serialNumber=' . $serialNumber . ',nextSerial=' . $nextSerial);
+ /* NOISY-DEBUG */ $this->debugOutput('CHUNK-HANDLER: serialNumber=' . $serialNumber . ',nextSerial=' . $nextSerial);
// Is it not the same? Then re-request it
if ($serialNumber != $nextSerial) {
diff --git a/application/hub/main/helper/connection/class_BaseConnectionHelper.php b/application/hub/main/helper/connection/class_BaseConnectionHelper.php
index c13e74d35..2fdc0f493 100644
--- a/application/hub/main/helper/connection/class_BaseConnectionHelper.php
+++ b/application/hub/main/helper/connection/class_BaseConnectionHelper.php
@@ -383,6 +383,9 @@ class BaseConnectionHelper extends BaseHubHelper implements Registerable, Protoc
// The helper's state must be 'connected'
$this->getStateInstance()->validatePeerStateConnected();
+ // Reset serial number
+ $this->getFragmeneterInstance()->resetSerialNumber();
+
// Cache buffer length
$bufferSize = $this->getConfigInstance()->getConfigEntry($this->getProtocol() . '_buffer_length');
diff --git a/application/hub/main/package/fragmenter/class_PackageFragmenter.php b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
index 0a967973b..1f3adba57 100644
--- a/application/hub/main/package/fragmenter/class_PackageFragmenter.php
+++ b/application/hub/main/package/fragmenter/class_PackageFragmenter.php
@@ -518,6 +518,10 @@ class PackageFragmenter extends BaseHubSystem implements Fragmentable, Registera
* @return void
*/
public function resetSerialNumber () {
+ // Debug message
+ /* NOISY-DEBUG: */ $this->debugOutput('FRAGMENTER: Resetting serial number, previous=' . $this->serialNumber);
+
+ // Reset serial number
$this->serialNumber = 0;
}
}
--
2.39.5