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

peer update

Browse Source 
git-svn-id: svn://db.shs.com.ru/pip@32 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
Пелипенко Иван
2015-03-16 15:38:24 +00:00
parent 31fbfe65a4
commit f2e85a736d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/io/pipeer.cpp
View File

@@ -406,6 +406,7 @@ bool PIPeer::mbcastRead(uchar * data, int size) {
case 2: // remove peer case 2: // remove peer
//piCout << "remove peer packet ..." << pi.name; //piCout << "remove peer packet ..." << pi.name;
peers_mutex.lock(); peers_mutex.lock();
removeNeighbour(pi.name);
rpi = getPeerByName(pi.name); rpi = getPeerByName(pi.name);
if (rpi) { if (rpi) {
dist = rpi->dist; dist = rpi->dist;
@@ -465,6 +466,7 @@ bool PIPeer::mbcastRead(uchar * data, int size) {
peer.addNeighbours(rpeer.neighbours); peer.addNeighbours(rpeer.neighbours);
rpeer.neighbours = peer.neighbours; rpeer.neighbours = peer.neighbours;
if (peer.name == pi.name) peer.sync = 0; if (peer.name == pi.name) peer.sync = 0;
ch = true;
} }
piBreak; piBreak;
} }
@@ -543,7 +545,6 @@ void PIPeer::removeNeighbour(const PIString & name) {
bool PIPeer::removePeer(const PIString & name) { bool PIPeer::removePeer(const PIString & name) {
removeNeighbour(name);
for (int i = 0; i < peers.size_s(); ++i) for (int i = 0; i < peers.size_s(); ++i)
if (peers[i].name == name) { if (peers[i].name == name) {
peers.remove(i); peers.remove(i);

2
utils/system_daemon/daemon.cpp
View File

@@ -64,6 +64,7 @@ void Daemon::showTile(PIScreenTile * t, const PIString & header) {
tile_header->content.resize(1); tile_header->content.resize(1);
tile_header->content[0].first = header; tile_header->content[0].first = header;
tile_header->content[0].second.flags = Bold; tile_header->content[0].second.flags = Bold;
lock();
if (!conn_name.isEmpty()) if (!conn_name.isEmpty())
tile_header->content[0].first.insert(0, PIString("Daemon \"") + connectedDaemon() + "\": "); tile_header->content[0].first.insert(0, PIString("Daemon \"") + connectedDaemon() + "\": ");
/*PIString s; /*PIString s;
@@ -73,6 +74,7 @@ void Daemon::showTile(PIScreenTile * t, const PIString & header) {
tile_header->content.resize(1); tile_header->content.resize(1);
tile_header->content[0].first = s; tile_header->content[0].first = s;
tile_header->content[0].second.flags = Bold;*/ tile_header->content[0].second.flags = Bold;*/
unlock();
} }