From f4a05c20429c83a81576552781afa1190da4726f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Wed, 19 Apr 2017 15:52:06 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@408 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/io/pibasetransfer.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src_main/io/pibasetransfer.cpp b/src_main/io/pibasetransfer.cpp index d96a0390..b0c7235a 100644 --- a/src_main/io/pibasetransfer.cpp +++ b/src_main/io/pibasetransfer.cpp @@ -62,6 +62,7 @@ void PIBaseTransfer::received(PIByteArray data) { data >> h; PacketType pt = (PacketType)h.type; if (!h.check_sig()) { + piCoutObj << "invalid packet signature"; diag.received(data.size(), false); return; } else diag.received(data.size(), true); @@ -79,8 +80,8 @@ void PIBaseTransfer::received(PIByteArray data) { uint ccrc = crc.calculate(data.data(), data.size_s()); if (rcrc != ccrc) { header.id = h.id; - sendReply(pt_ReplyInvalid); piCoutObj << "invalid CRC"; + sendReply(pt_ReplyInvalid); } else { mutex_session.lock(); processData(h.id, data); @@ -110,6 +111,8 @@ void PIBaseTransfer::received(PIByteArray data) { mutex_session.lock(); if (h.id < replies.size()) replies[h.id] = pt; + else + piCoutObj << "invalid reply id"; mutex_session.unlock(); // piCoutObj << "Done Packet" << h.id; } @@ -419,7 +422,7 @@ void PIBaseTransfer::sendBreak(int session_id) { void PIBaseTransfer::sendReply(PacketType reply) { - //piCoutObj << "sendReply" << reply; + piCoutObj << "sendReply" << reply; header.type = reply; PIByteArray ba; ba << header;