git-svn-id: svn://db.shs.com.ru/pip@413 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user