TilePICoutix

git-svn-id: svn://db.shs.com.ru/pip@45 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
2015-03-30 11:23:13 +00:00
parent 595543bea9
commit 0cb2b20d2e
11 changed files with 75 additions and 19 deletions

View File

@@ -314,12 +314,12 @@ bool PIPeer::dataRead(uchar * readed, int size) {
if (type != 4) return true;
diag_d.received(size);
ba >> from >> to >> cnt >> rec_size;
//piCout << "[PIPeer \"" + name_ + "\"] Received packet" << /*type << from << to << cnt <<*/ rec_size;
piCoutObj << "Received packet" << type << from << to << cnt << rec_size;
if (type == 4) { // data packet
if (to == self_info.name) { // my packet
int msg_count, cmsg;
ba >> msg_count >> cmsg;
//piCout << "[PIPeer \"" + name_ + "\"] Received packet" << type << from << to << cnt << rec_size << msg_count << cmsg;
piCoutObj << "Received packet" << type << from << to << cnt << rec_size << msg_count << cmsg;
if (cmsg == 0 && msg_count == 1) {
dataReceived(from, ba);
dataReceivedEvent(from, ba);
@@ -333,11 +333,11 @@ bool PIPeer::dataRead(uchar * readed, int size) {
}
PeerData & pd(fp->_data);
if (cmsg == 0) {
//piCout << "[PIPeer \"" + name_ + "\"] Packet clear" << rec_size;
piCoutObj << "Packet clear" << rec_size;
pd.clear();
pd.msg_count = msg_count;
}
//piCout << "[PIPeer \"" + name_ + "\"] Packet add" << cmsg << ba.size_s();
piCoutObj << "Packet add" << cmsg << ba.size_s();
pd.addData(ba);
bool frec = pd.isFullReceived();
PIByteArray rba(pd.data);
@@ -345,7 +345,7 @@ bool PIPeer::dataRead(uchar * readed, int size) {
if (frec) {
dataReceived(from, rba);
dataReceivedEvent(from, rba);
//piCout << "[PIPeer \"" + name_ + "\"] Packet received" << pd.data.size_s();
piCoutObj << "Packet received" << pd.data.size_s();
}
return true;
}