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

PIPeer important fix!

Browse Source 
git-svn-id: svn://db.shs.com.ru/pip@112 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
Пелипенко Иван
2015-04-20 08:18:43 +00:00
parent 4b1f8cc30d
commit 8c6370fda5
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/io/pipeer.h
View File

@@ -42,8 +42,8 @@ private:
EVENT_HANDLER1(void, dtReceiveFinishedIn, bool, ok) {if (ok) received(name(), dt_in.data());}
EVENT_HANDLER1(void, dtReceiveFinishedOut, bool, ok) {if (ok) received(name(), dt_out.data());}
EVENT_HANDLER(void, dtThread);
EVENT2(received, const PIString &, from, const PIByteArray &, data);
EVENT2(sendRequest, const PIString &, to, const PIByteArray &, data);
EVENT2(received, const PIString &, from, const PIByteArray &, data)
EVENT2(sendRequest, const PIString &, to, const PIByteArray &, data)
bool send(const PIByteArray & d);
void receivedPacket(uchar type, const PIByteArray & d);
void setDist(int dist);
@@ -133,9 +133,9 @@ public:
void lock() {peers_mutex.lock();}
void unlock() {peers_mutex.unlock();}
EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data);
EVENT1(peerConnectedEvent, const PIString &, name);
EVENT1(peerDisconnectedEvent, const PIString &, name);
EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data)
EVENT1(peerConnectedEvent, const PIString &, name)
EVENT1(peerDisconnectedEvent, const PIString &, name)
protected:
virtual void dataReceived(const PIString & from, const PIByteArray & data) {;}

32
src/system/piprocess.h
View File

@@ -1,23 +1,23 @@
/*! \file piprocess.h
* \brief Process
* \brief Process
*/
/*
PIP - Platform Independent Primitives
Process
Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com
PIP - Platform Independent Primitives
Process
Copyright (C) 2015 Ivan Pelipenko peri4ko@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PIPROCESS_H
@@ -80,7 +80,7 @@ public:
EVENT1(execStarted, PIString, program)
EVENT2(execFinished, PIString, program, int, exit_code)
static PIStringList currentEnvironment();
static PIStringList currentEnvironment();
static int currentPID();
private:
@@ -94,7 +94,7 @@ private:
bool g_in, g_out, g_err, t_in, t_out, t_err;
#ifdef WINDOWS
STARTUPINFOA si;
PROCESS_INFORMATION pi;
PROCESS_INFORMATION pi;
#else
pid_t pid;
#endif

2
utils/system_daemon/daemon.h
View File

@@ -124,7 +124,7 @@ private:
EVENT_HANDLER2(void, filesReceived, const PIString & , name, bool, ok);
EVENT_HANDLER2(void, filesRemoved, const PIString & , name, const PIString & , dir);
EVENT_HANDLER2(void, closeFileDialog, const PIString & , name, bool, ok);
EVENT(menuRequest);
EVENT(menuRequest)
void hideAll();
void showTile(PIScreenTile * t, const PIString & header = PIString());
void fillInfoTile(const HostInfo & hi);