SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

State iconsferansfers fixnsfer

Browse Source 
git-svn-id: svn://db.shs.com.ru/pip@53 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
Пелипенко Иван
2015-03-31 11:23:05 +00:00
parent 476fd02cd1
commit adfb47e82d
8 changed files with 64 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
utils/udp_file_transfer/main.cpp
View File

@@ -2,77 +2,6 @@
#include "pifiletransfer.h"
#include "pidatatransfer.h"
class Ob: public PIObject {
PIOBJECT(Ob)
public:
Ob() {
srand(PISystemTime::current().toMicroseconds());
bytes_from = bytes_to = 0;
sft.setName("sft");
//sft.setDirectory(sft.directory().cd("..\\"));
//piCout << "Send File Transfer DIrectory" << sft.directory().absolutePath();
CONNECTU(&sft, sendRequest, this, ssend);
rft.setName("rft");
//rft.setDirectory(rft.directory().cd("..\\1"));
//piCout << "Receive File Transfer DIrectory" << rft.directory().absolutePath();
CONNECTU(&rft, sendRequest, this, rsend);
}
void startsend() {
// PIDir dir = PIDir::current();
// dir.cd("..\\");
// piCout << dir.absolutePath();
// PIVector<PIFile::FileInfo> des = dir.allEntries();
// piCout << "all entries" << des.size();
// PIFile::FileInfo sde;
// piForeachC(PIFile::FileInfo de, des) {
// piCout << (de.isDir() ? "dir:" : "file") << de.name << de.size;
// if (de.name() == "0") sde = de;
// }
// sft.setPacketSize(64096);
// sft.send(sde);
PIByteArray ba;
ba.resize(65536);
for (int i=0; i<ba.size_s(); i++)
ba[i] = rand() % 254;
//sft.setPacketSize(128);
if (!sft.send(ba)) {piCoutObj << "SEND FAILED"; return;}
PIByteArray ba2 = rft.data();
// ba[2]++;
if (ba != ba2) {piCoutObj << "DATA CORRUPTED"; return;}
piCoutObj << "SUCCESS";
}
private:
EVENT_HANDLER1(void, ssend, PIByteArray &, data) {
bytes_to += data.size();
piCout << "[sender]" << sft.stateString() << ". datasize =" << data.size()
<< "(" << PIString::readableSize(sft.bytesCur()) << "/" << PIString::readableSize(sft.bytesAll()) << ")"
<< "(" << PIString::readableSize(bytes_to) << "/" << PIString::readableSize(bytes_from) << ")";
// if(rand()%100 > 80) {data.remove(data.size()/2, 1);}
// if(rand()%100 > 70) {data[data.size()-6] = 1;}
// if(rand()%100 < 90)
rft.received(data);
}
EVENT_HANDLER1(void, rsend, PIByteArray &, data) {
bytes_from += data.size();
piCout << "[receiver]" << rft.stateString() << ". datasize =" << data.size()
<< "(" << PIString::readableSize(rft.bytesCur()) << "/" << PIString::readableSize(rft.bytesAll()) << ")"
<< "(" << PIString::readableSize(bytes_to) << "/" << PIString::readableSize(bytes_from) << ")";
// if(rand()%100 > 80) {data.remove(data.size()/2, 1);}
// if(rand()%100 > 70) {data[data.size()-6] = 1;}
// if(rand()%100 < 90)
sft.received(data);
}
PIDataTransfer sft;
PIDataTransfer rft;
ullong bytes_to, bytes_from;
};
class UDPFileTransfer: public PITimer {
PIOBJECT_SUBCLASS(UDPFileTransfer, PITimer)
@@ -122,14 +51,9 @@ private:
};
int main (int argc, char * argv[]) {
// Ob o;
// PITimeMeasurer tm;
// o.startsend();
// piCout << tm.elapsed_s();
// return 0;
if (!(argc == 3 || argc == 4)) {
piCout << "UDPFileTransfer";
piCout << "USE: piptest [src_ip_port] [dst_ip_port] {filename}";
piCout << "UDP File Transfer";
piCout << "USE: pift src_ip:port dst_ip:port [filename]";
return 0;
}
PIKbdListener kbd;
@@ -137,7 +61,7 @@ int main (int argc, char * argv[]) {
PIString src = argv[1];
PIString dst = argv[2];
UDPFileTransfer f(src, dst);
piCout << "work directory" << f.ft.directory().absolutePath() << ", listen on" << src << ",send to" << dst;
piCout << "work directory" << f.ft.directory().absolutePath() << ", listen on" << src << ", send to" << dst;
if (argc == 4) {
PIString file = argv[3];
piCout << "send file" << file;