diff --git a/Protocol.cpp b/Protocol.cpp index 66a35e18b20ac23c43594aa4c98d3e8649b78b52..efb88761e617dc787390927c0ab20aafb98d0920 100644 --- a/Protocol.cpp +++ b/Protocol.cpp @@ -64,7 +64,7 @@ int Protocol::setData(vector<BYTE> data, int type){ msg.type = bitset<TYPE_S>(type); int size = ((int)data.size())-i; first = data.begin()+i; - last = data.begin()+size+1; + last = data.begin()+i+size+1; vector<BYTE> subvector(first, last); msg.data = subvector; if(size < MINSIZE){ @@ -179,7 +179,7 @@ void Protocol::receive(int sockt, int window){ } else if(status == OUTPUT) { cout << messages.back().getDataAsString(); - + frame.push_back(messages.size()); response.reset(); diff --git a/dirFunctions.cpp b/dirFunctions.cpp index ec794266da2ca98d4ed027055078c4349d47036c..d0e7aa4509560a894ee75b0e4ce921724bd2bce2 100644 --- a/dirFunctions.cpp +++ b/dirFunctions.cpp @@ -26,6 +26,5 @@ string ls(string args){ output += buffer; } pclose(lsOut); - cout << "output: "<< output<<endl; return output; -} \ No newline at end of file +}