hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/input/input.cpp
This commit is contained in:
Thulinma 2017-05-12 12:48:58 +02:00
commit 0c87ba1f7b
9 changed files with 175 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/io.h
View file

@ -63,6 +63,8 @@ namespace Mist {
IPC::sharedPage encryptionPage;
void continueNegotiate(unsigned long tid, DTSC::Meta & myMeta, bool quickNegotiate = false);
void continueNegotiate(DTSC::Meta & myMeta);
uint32_t negTimer; ///< How long we've been negotiating, in packets.
};
@ -77,6 +79,7 @@ namespace Mist {
virtual void bufferLivePacket(DTSC::Packet & packet);
protected:
void continueNegotiate(unsigned long tid, bool quickNegotiate = false);
void continueNegotiate();