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

PIPeer data transfers fixnsfer

Browse Source 
git-svn-id: svn://db.shs.com.ru/pip@50 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
Пелипенко Иван
2015-03-31 09:30:52 +00:00
parent ca32c2695d
commit 845394f9de
3 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
main.cpp
View File

@@ -135,27 +135,10 @@ public:
//#include <netdb.h> //#include <netdb.h>
int main (int argc, char * argv[]) { int main (int argc, char * argv[]) {
PIString s, s2; PIDir d;
s = "test"; piCout << d.path();
PICout(0xFFFF) << s << s.length(); d.setDir("C:/asd/fgh");
s += PIString(" test") + " !"; piCout << d.path();
PICout(0xFFFF) << s << s.length();
s.clear();
PICout(0xFFFF) << s << s.length();
s += " test";
PICout(0xFFFF) << s << s.length();
s.insert(1, PIString("|") + ",|");
PICout(0xFFFF) << s << s.length() << (s == (PIString(" |,|")+"test"));
s.resize(4);
PICout(0xFFFF) << s << s.length();
s = PIString("new");
PICout(0xFFFF) << s << s.length();
PIByteArray ba;
ba << s;
piCout << ba.size() << ba;
ba >> s2;
PICout(0xFFFF) << s2 << s2.length();
return 0; return 0;
/* /*
hostent * he = 0; hostent * he = 0;

2
src/io/pipeer.cpp
View File

@@ -320,7 +320,7 @@ bool PIPeer::sendInternal(const PIString & to, const PIByteArray & data) {
} }
PIByteArray ba; PIByteArray ba;
ba << int(4) << self_info.name << to << int(0) << data; ba << int(4) << self_info.name << to << int(0) << data;
//piCoutObj << "sendInternal" << to << data.size_s() << int(data.front()); piCoutObj << "sendInternal" << to << data.size_s() << int(data.front());
if (!sendToNeighbour(dp, ba)) return false; if (!sendToNeighbour(dp, ba)) return false;
return true; return true;
} }

2
utils/system_daemon/file_manager.cpp
View File

@@ -213,7 +213,7 @@ void FileManager::setRemoteDir(const PIString & d) {
panels[1]->dir.setDir(d); panels[1]->dir.setDir(d);
if (panels[1]->label_path) { if (panels[1]->label_path) {
panels[1]->label_path->content.resize(1); panels[1]->label_path->content.resize(1);
panels[1]->label_path->content[0].first = panels[1]->dir.absolutePath(); panels[1]->label_path->content[0].first = panels[1]->dir.path();
} }
} }