diff --git a/connection b/connection new file mode 100755 index 0000000000000000000000000000000000000000..713f775e3912e41a9f7364f31bf23ff54a8ed973 Binary files /dev/null and b/connection differ diff --git a/lib/connectionRawSocket.a b/lib/connectionRawSocket.a new file mode 100644 index 0000000000000000000000000000000000000000..69818586150774588f98629588210c643cf0ce78 Binary files /dev/null and b/lib/connectionRawSocket.a differ diff --git a/lib/messages.a b/lib/messages.a new file mode 100644 index 0000000000000000000000000000000000000000..5fb319a46318df245208839f616cdf34c851677e Binary files /dev/null and b/lib/messages.a differ diff --git a/lib/miniShell.a b/lib/miniShell.a new file mode 100644 index 0000000000000000000000000000000000000000..549621d240e2fea1f6ddae0781f15032756702ee Binary files /dev/null and b/lib/miniShell.a differ diff --git a/lib/submessages.a b/lib/submessages.a new file mode 100644 index 0000000000000000000000000000000000000000..72fe676ec7b3a2d61449f788e883964849c65a38 Binary files /dev/null and b/lib/submessages.a differ diff --git a/obj/connectionRawSocket.o b/obj/connectionRawSocket.o new file mode 100644 index 0000000000000000000000000000000000000000..ba1eba042c74e335d1d8674b6ee3dbc770a7b304 Binary files /dev/null and b/obj/connectionRawSocket.o differ diff --git a/obj/messages.o b/obj/messages.o new file mode 100644 index 0000000000000000000000000000000000000000..c958710b6958c89342aeb085330e53cbc0f22683 Binary files /dev/null and b/obj/messages.o differ diff --git a/obj/miniShell.o b/obj/miniShell.o new file mode 100644 index 0000000000000000000000000000000000000000..b85f9e0f5aaa2ef9f339ba59098f6e4bad49076b Binary files /dev/null and b/obj/miniShell.o differ diff --git a/obj/submessages.o b/obj/submessages.o new file mode 100644 index 0000000000000000000000000000000000000000..d95dcfdde26bb3dd3ba69ac0a008b484ca86f2b4 Binary files /dev/null and b/obj/submessages.o differ diff --git a/src/messages.cpp b/src/messages.cpp index 40faec1bce542a9153b6f99039250b7058663d67..dafeb2d8793162675eb48559951ba6e638fd3339 100644 --- a/src/messages.cpp +++ b/src/messages.cpp @@ -92,22 +92,22 @@ int Message::sendLS(unsigned char* options){ cout << "Erro no recebimento de resposta (messages.cpp::sendLS)" << endl; return -1; } else { -cout << "recv" << endl; +// cout << "recv" << endl; recv(soquete, receiptMessage, 68, 0); // Lê começo da mensagem e vê se tem o delimitador de início if(receiptMessage[0] == 0x7E){ // 0x7E = 01111110 answer.stringToObj((unsigned char*)receiptMessage); success = 1; -cout << "checkparity" << endl; +// cout << "checkparity" << endl; if(answer.checkParity()){ // Caso a paridade dê errado success = 0; // Vai reenviar -cout << "deu ruim" << endl; +// cout << "deu ruim" << endl; }else{ -cout << "deu boa" << endl; +// cout << "deu boa" << endl; if(answer.getType() == 1){ -cout << "recebeu ack" << endl; +// cout << "recebeu ack" << endl; showLS = receiveData(10); -cout << "recebeu dados" << endl; +// cout << "recebeu dados" << endl; if(showLS != ""){ success = 1; cout << showLS << endl; @@ -459,19 +459,19 @@ int Message::receiveLS(unsigned char* options, char* currentPath){ /* Precisamos pensar em um jeito de concertar isso. */ switch(lsParameter(parameter)){ case 1: - lsAux = "ls > " + path + "/ls.txt"; + lsAux = "ls > " + path + "/.ls.txt"; system(lsAux.c_str()); break; case 2: - lsAux = "ls -a > " + path + "/ls.txt"; + lsAux = "ls -a > " + path + "/.ls.txt"; system(lsAux.c_str()); break; case 3: - lsAux = "ls -l > " + path + "/ls.txt"; + lsAux = "ls -l > " + path + "/.ls.txt"; system(lsAux.c_str()); break; case 4: - lsAux = "ls -la > " + path + "/ls.txt"; + lsAux = "ls -la > " + path + "/.ls.txt"; system(lsAux.c_str()); break; case -1: @@ -482,7 +482,7 @@ int Message::receiveLS(unsigned char* options, char* currentPath){ printf("\n"); // Abertura do arquivo de entrada. - fileName = path + "/ls.txt"; + fileName = path + "/.ls.txt"; lsFile.open(fileName.c_str(), ios::in); lsFile.seekg (0); // Leitura do arquivo. @@ -655,36 +655,36 @@ string Message::receiveData(int type){ cout << "Erro no recebimento dos dados (messages.cpp::receiveData)" << endl; return(""); }else{ -cout << "recv" << endl; +// cout << "recv" << endl; recv(soquete, receiptMessage, 68, 0); answer.stringToObj((unsigned char*)receiptMessage); // Lê começo da mensagem e vê se tem o delimitador de início if(answer.getStartMessage() == 0x7E){ // 0x7E = 01111110 -cout << "startmesg" << endl; +// cout << "startmesg" << endl; if(answer.checkParity()){ -cout << "paridade deu ruim" << endl; +// cout << "paridade deu ruim" << endl; nack.setData((unsigned char*)"0",0,0); // Manda um nack send(soquete,nack.objToString(),68, 0); }else{ -cout << "paridade deu boa" << endl; +// cout << "paridade deu boa" << endl; if(answer.getType() == type){ -cout << "tipo = ls" << endl; +// cout << "tipo = ls" << endl; if(subData[(seqCounter*64)+answer.getSeq()] == ""){ subData[(seqCounter*64)+answer.getSeq()] = (char*)answer.getData(); if(answer.getSeq() == 63) seqCounter++; size++; -cout << "seqc = " << seqCounter << endl; -cout << "size = " << size << endl; +// cout << "seqc = " << seqCounter << endl; +// cout << "size = " << size << endl; } ack.setData((unsigned char*)"0",1,0); send(soquete, ack.objToString(), 68, 0); // Manda um ACK }else if(answer.getType() == 15){ -cout << "tipo = fim" << endl; +// cout << "tipo = fim" << endl; success = 1; ack.setData((unsigned char*)"0",1,0); send(soquete, ack.objToString(), 68, 0); // Manda um ACK }else{ -cout << "tipo = sei la -> nack" << endl; +// cout << "tipo = sei la -> nack" << endl; nack.setData((unsigned char*)"0",0,0); // Manda um nack send(soquete,nack.objToString(),68, 0); }