SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@413 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2017-04-19 16:27:39 +00:00
parent b3497c3eed
commit 6558910d3e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src_main/io/pibasetransfer.cpp
View File

@@ -66,7 +66,7 @@ void PIBaseTransfer::received(PIByteArray data) {
diag.received(data.size(), false); diag.received(data.size(), false);
return; return;
} else diag.received(data.size(), true); } 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) { switch (pt) {
case pt_Unknown: break; case pt_Unknown: break;
case pt_Data: case pt_Data:
@@ -162,6 +162,7 @@ void PIBaseTransfer::received(PIByteArray data) {
mutex_header.unlock(); mutex_header.unlock();
finish_receive(false, true); finish_receive(false, true);
} else { } else {
header.id = 0;
sendReply(pt_ReplySuccess); sendReply(pt_ReplySuccess);
mutex_header.unlock(); mutex_header.unlock();
return; return;
@@ -423,7 +424,7 @@ void PIBaseTransfer::sendBreak(int session_id) {
void PIBaseTransfer::sendReply(PacketType reply) { void PIBaseTransfer::sendReply(PacketType reply) {
piCoutObj << "sendReply" << reply; //piCoutObj << "sendReply" << reply;
header.type = reply; header.type = reply;
PIByteArray ba; PIByteArray ba;
ba << header; ba << header;

2
utils/udp_file_transfer/main.cpp
View File

@@ -108,11 +108,9 @@ private:
EVENT_HANDLER1(void, ftsend, PIByteArray &, data) { EVENT_HANDLER1(void, ftsend, PIByteArray &, data) {
eth.send(data); eth.send(data);
piCout << "send";
} }
EVENT_HANDLER2(void, received, uchar * , readed, int, size) { EVENT_HANDLER2(void, received, uchar * , readed, int, size) {
piCout << "received";
PIByteArray ba(readed, size); PIByteArray ba(readed, size);
if(test_) { if(test_) {
testt.received(ba); testt.received(ba);