From 4cb1f2baa01de76958ac88009e3c79831d720c95 Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Tue, 8 Dec 2015 14:40:20 -0200
Subject: [PATCH] Debugs commented on server
Signed-off-by: Vytor Calixto <vytorcalixto@gmail.com>
---
server.cpp | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/server.cpp b/server.cpp
index beeb266..771c713 100644
--- a/server.cpp
+++ b/server.cpp
@@ -9,7 +9,7 @@ int main(){
cout << "Você está rodando o servidor Caco\n";
while(true){
int status = receiveProtocol.recvMessage(sockt);
- cout << "status: " << status << endl;
+ // cout << "status: " << status << endl;
// cout << protocol.getDataAsString() << endl;
try{
if(status == NOISE){
@@ -17,26 +17,28 @@ int main(){
}
if(status == CD){
cout << "Recebeu CD\n";
- cout << "CD: " << receiveProtocol.getDataAsString() << endl;
+ // cout << "CD: " << receiveProtocol.getDataAsString() << endl;
cd(receiveProtocol.getDataAsString());
sendProtocol.setData(vector<BYTE>(1,(BYTE)0), OK);
sendProtocol.sendMessage(sockt,0);
}else if(status == LS){
- cout << "protocol data: " << receiveProtocol.getDataAsString() << endl;
- cout << "message data: " << receiveProtocol.getMessages().back().getDataAsString() << endl;
+ cout << "Recebeu LS\n";
+ // cout << "protocol data: " << receiveProtocol.getDataAsString() << endl;
+ // cout << "message data: " << receiveProtocol.getMessages().back().getDataAsString() << endl;
string output = ls(receiveProtocol.getMessages().back().getDataAsString());
- cout << "LS: " << output << endl;
+ // cout << "LS: " << output << endl;
sendProtocol.setData(vector<BYTE>(output.begin(), output.end()), OUTPUT);
sendProtocol.transmit(sockt, WAIT_STOP);
- cout << "finished transmit" << endl;
+ // cout << "finished transmit" << endl;
}else if(status == PUT){
+ cout << "Recebeu PUT\n";
string fileName = receiveProtocol.getDataAsString();
- cout << "fileName: " << fileName <<endl;
+ // cout << "fileName: " << fileName <<endl;
sendProtocol.setData(vector<BYTE>(1,(BYTE)0), OK);
sendProtocol.sendMessage(sockt,0);
receiveProtocol.reset();
receiveProtocol.receive(sockt,SIZE,WAIT_STOP,false);
- cout << "fileSize: " << receiveProtocol.getDataAsString() <<endl;
+ // cout << "fileSize: " << receiveProtocol.getDataAsString() <<endl;
unsigned long long fileSize = stoi(receiveProtocol.getDataAsString());
sendProtocol.reset();
if(hasEnoughSpace(fileSize)){
@@ -49,14 +51,15 @@ int main(){
}
receiveProtocol.reset();
receiveProtocol.receive(sockt,DATA,SLIDING,true);
- cout <<"conteudo: "<< receiveProtocol.getDataAsString()<<endl;
+ // cout <<"conteudo: "<< receiveProtocol.getDataAsString()<<endl;
writeFile(getWorkingPath()+"/"+fileName,receiveProtocol.getData());
}else if(status == GET){
+ cout << "Recebeu GET\n";
string filePath = getWorkingPath()+"/"+receiveProtocol.getDataAsString();
if(fexists(filePath)) {
string size = to_string(filesize(filePath));
- cout << "ARQUIVO: " << filePath << "|" << size << endl;
+ // cout << "ARQUIVO: " << filePath << "|" << size << endl;
sendProtocol.setData(vector<BYTE>(size.begin(), size.end()), SIZE);
sendProtocol.sendMessage(sockt, 0);
int error = receiveProtocol.receive(sockt, OK, WAIT_STOP, false);
--
GitLab