From 79413d59cb39d40d80815791f1143a7445ce4070 Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Sat, 5 Dec 2015 16:51:49 -0200
Subject: [PATCH] Commented sequence check on recv
---
Protocol.cpp | 11 +++++++----
client.cpp | 1 +
server.cpp | 2 ++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Protocol.cpp b/Protocol.cpp
index c47bf94..9fa9699 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 a41ebf9..1a3576a 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 e0fd2f1..a3c177a 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();
--
GitLab