git-svn-id: svn://db.shs.com.ru/pip@383 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -907,7 +907,7 @@ void PIConsole::listenServers() {
|
|||||||
stopPeer();
|
stopPeer();
|
||||||
server_mode = false;
|
server_mode = false;
|
||||||
server_name.clear();
|
server_name.clear();
|
||||||
srand(PISystemTime::current().nanoseconds);
|
randomize();
|
||||||
peer = new PIPeer("_rcc_:" + PIDateTime::current().toString("hhmmssddMMyy_") + PIString::fromNumber(rand()));
|
peer = new PIPeer("_rcc_:" + PIDateTime::current().toString("hhmmssddMMyy_") + PIString::fromNumber(rand()));
|
||||||
CONNECT2(void, const PIString & , const PIByteArray &, peer, dataReceivedEvent, this, peerReceived);
|
CONNECT2(void, const PIString & , const PIByteArray &, peer, dataReceivedEvent, this, peerReceived);
|
||||||
peer_timer->start(100.);
|
peer_timer->start(100.);
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
#include "pifiletransfer.h"
|
#include "pifiletransfer.h"
|
||||||
#include "piincludes_p.h"
|
|
||||||
|
|
||||||
const char PIFileTransfer::sign[] = {'P', 'F', 'T'};
|
const char PIFileTransfer::sign[] = {'P', 'F', 'T'};
|
||||||
|
|
||||||
@@ -79,7 +78,7 @@ bool PIFileTransfer::sendFiles(const PIVector<PFTFileInfo> &files) {
|
|||||||
if (files_[i].isDir()) files_[i].size = 0;
|
if (files_[i].isDir()) files_[i].size = 0;
|
||||||
// piCout << "prepare" << i << files_[i].path << files_[i].dest_path << files_[i].name();
|
// piCout << "prepare" << i << files_[i].path << files_[i].dest_path << files_[i].name();
|
||||||
}
|
}
|
||||||
srand(PISystemTime::current().toMilliseconds());
|
randomize();
|
||||||
pftheader.session_id = rand();
|
pftheader.session_id = rand();
|
||||||
sendFilesStarted();
|
sendFilesStarted();
|
||||||
cur_file_string = "build session";
|
cur_file_string = "build session";
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
#include "pipeer.h"
|
#include "pipeer.h"
|
||||||
#include "piconfig.h"
|
#include "piconfig.h"
|
||||||
#include "piincludes_p.h"
|
|
||||||
|
|
||||||
#define _PIPEER_MSG_SIZE 4000
|
#define _PIPEER_MSG_SIZE 4000
|
||||||
#define _PIPEER_MSG_TTL 100
|
#define _PIPEER_MSG_TTL 100
|
||||||
@@ -149,7 +148,7 @@ PIPeer::PIPeer(const PIString & n): PIIODevice(), inited__(false), eth_tcp_srv(P
|
|||||||
self_info.dist = 0;
|
self_info.dist = 0;
|
||||||
self_info.time = PISystemTime::current();
|
self_info.time = PISystemTime::current();
|
||||||
//joinMulticastGroup("239.240.241.242");
|
//joinMulticastGroup("239.240.241.242");
|
||||||
srand(uint(PISystemTime::current(true).toMicroseconds()));
|
randomize();
|
||||||
//id_ = self_info.name + "_" + PIString::fromNumber(rand());
|
//id_ = self_info.name + "_" + PIString::fromNumber(rand());
|
||||||
CONNECTU(&sync_timer, tickEvent, this, timerEvent);
|
CONNECTU(&sync_timer, tickEvent, this, timerEvent);
|
||||||
prev_ifaces = PIEthernet::interfaces();
|
prev_ifaces = PIEthernet::interfaces();
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
class _Init {
|
class _Init {
|
||||||
public:
|
public:
|
||||||
_Init() {srand(PISystemTime::current().toMicroseconds());}
|
_Init() {randomize();}
|
||||||
};
|
};
|
||||||
_Init _pisd_init;
|
_Init _pisd_init;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user