diff --git a/Protocol.cpp b/Protocol.cpp index c47bf94ff93839d0b02d8678208b0899e5a5ff32..9fa9699956198204d9516c5ad5918cb4596970d5 100644 --- a/Protocol.cpp +++ b/Protocol.cpp @@ -77,17 +77,19 @@ void Protocol::setData(vector<BYTE> data, int type){ int Protocol::recvMessage(int sockt){ BYTE dataRec[MAXSIZE+4]; int r = recv(sockt, dataRec, MAXSIZE+4, 0); - cout << "recv response: " << r << endl; cout << bitset<8>(dataRec[0]) << bitset<8>(dataRec[1]) << bitset<8>(dataRec[2]) << "|\t"; + cout << "recv response: " << r << endl; if(dataRec[0] != BEGIN){ return NOISE; } Message msg = Message(); int size = (int)(dataRec[1]>>2); msg.setBitFields(dataRec[0], dataRec[1], dataRec[2], dataRec[size+3]); - if(msg.sequence.to_ulong() != ((messages.back().sequence.to_ulong()+1)%(MAXSIZE+1))){ - return SEQ_MISS; - } + cout << "Sequence:" << msg.sequence.to_ulong() << endl; + // FIXME: Erro na primeira mensagem de sequencialização + // if(msg.sequence.to_ulong() != ((messages.back().sequence.to_ulong()+1)%(MAXSIZE+1))){ + // return SEQ_MISS; + // } if(!msg.checkParity()){ return INCONSISTENT; } @@ -99,6 +101,7 @@ int Protocol::recvMessage(int sockt){ memcpy(msgData,dataRec+3,size); msg.data.insert(msg.data.end(), msgData, msgData+size); messages.push_back(msg); + cout << "Tipo:" << (int)msg.type.to_ulong() << endl; return (int)msg.type.to_ulong(); } diff --git a/client.cpp b/client.cpp index a41ebf9f8482c99624c88d06b886f1a52f836b28..1a3576abbc9d69b678196f4a5a9741e44ad30cac 100644 --- a/client.cpp +++ b/client.cpp @@ -53,6 +53,7 @@ int main(){ } int status = protocol.recvMessage(sockt); + cout << "Status: " << status << endl; if(status > 0){ if(status == ENDTX){ protocol = Protocol(); diff --git a/server.cpp b/server.cpp index e0fd2f1a5e85ee39c09e7d1cc12ece1364ea97dd..a3c177a9ef70744baf3c87b113afd36eba6f8f82 100644 --- a/server.cpp +++ b/server.cpp @@ -9,6 +9,8 @@ int main(){ cout << "Você está rodando o servidor Caco\n"; while(true){ int status = protocol.recvMessage(sockt); + cout << "status: " << status << endl; + cout << protocol.getDataAsString() << endl; if(status > 0){ if(status == ENDTX){ protocol = Protocol();