From 4106e52cd7711393a4df8252952eedd69ebee148 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 14:53:31 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@406 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/io/pibasetransfer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src_main/io/pibasetransfer.cpp b/src_main/io/pibasetransfer.cpp index 24dfa5f5..4be6a66b 100644 --- a/src_main/io/pibasetransfer.cpp +++ b/src_main/io/pibasetransfer.cpp @@ -13,7 +13,7 @@ PIBaseTransfer::PIBaseTransfer(): crc(standardCRC_16()), diag(false) { bytes_all = bytes_cur = 0; send_queue = 0; timeout_ = 10.; - diag.setDisconnectTimeout(timeout_); + diag.setDisconnectTimeout(timeout_ / 10); //CONNECTU(&diag, qualityChanged, this, diagChanged); diag.setName("PIBaseTransfer"); diag.start(50); @@ -529,13 +529,13 @@ bool PIBaseTransfer::finish_send(bool ok) { is_sending = false; if (ok) state_string = "send done"; else state_string = "send failed"; - //piCoutObj << state_string << PIString::readableSize(bytes_all); mutex_header.lock(); header.id = 0; if (!ok) sendBreak(header.session_id); else sendReply(pt_ReplySuccess); mutex_header.unlock(); sendFinished(ok); + piCoutObj << state_string << PIString::readableSize(bytes_all); // diag.stop(); bytes_all = bytes_cur = 0; return ok; @@ -546,13 +546,13 @@ void PIBaseTransfer::finish_receive(bool ok, bool quet) { is_receiving = false; if (ok) state_string = "receive done"; else state_string = "receive failed"; - //piCoutObj << state_string << PIString::readableSize(bytes_all); if (!ok && !quet) { mutex_header.lock(); sendBreak(header.session_id); mutex_header.unlock(); } receiveFinished(ok); + piCoutObj << state_string << PIString::readableSize(bytes_all); // diag.stop(); bytes_all = bytes_cur = 0; }