From 6558910d3e0ce5d05a11c4fa6c0c9e32f391055c 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 16:27:39 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@413 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/io/pibasetransfer.cpp | 5 +++-- utils/udp_file_transfer/main.cpp | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src_main/io/pibasetransfer.cpp b/src_main/io/pibasetransfer.cpp index d0362063..97992f41 100644 --- a/src_main/io/pibasetransfer.cpp +++ b/src_main/io/pibasetransfer.cpp @@ -66,7 +66,7 @@ void PIBaseTransfer::received(PIByteArray data) { diag.received(data.size(), false); return; } else diag.received(data.size(), true); - piCoutObj << "receive" << h.session_id << h.type << h.id; + //piCoutObj << "receive" << h.session_id << h.type << h.id; switch (pt) { case pt_Unknown: break; case pt_Data: @@ -162,6 +162,7 @@ void PIBaseTransfer::received(PIByteArray data) { mutex_header.unlock(); finish_receive(false, true); } else { + header.id = 0; sendReply(pt_ReplySuccess); mutex_header.unlock(); return; @@ -423,7 +424,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; diff --git a/utils/udp_file_transfer/main.cpp b/utils/udp_file_transfer/main.cpp index 8352e04f..e1d5fa48 100644 --- a/utils/udp_file_transfer/main.cpp +++ b/utils/udp_file_transfer/main.cpp @@ -108,11 +108,9 @@ private: EVENT_HANDLER1(void, ftsend, PIByteArray &, data) { eth.send(data); - piCout << "send"; } EVENT_HANDLER2(void, received, uchar * , readed, int, size) { - piCout << "received"; PIByteArray ba(readed, size); if(test_) { testt.received(ba);