Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-27 11:17:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix conflicts

Browse source
This commit is contained in:
Jeff Becker 2016-11-01 10:02:10 -04:00
parent b4e9ed7d18
commit 9575f70f38
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
4 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Transports.cpp
View file

@ -4,11 +4,8 @@
#include "I2NPProtocol.h"
#include "NetDb.h"
#include "Transports.h"
<<<<<<< HEAD
#include "Config.h"
=======
#include "Event.h"
>>>>>>> bda4170... add web socket ui
using namespace i2p::data;
@ -596,16 +593,13 @@ namespace transport
}
else // incoming connection
{
<<<<<<< HEAD
if(RoutesRestricted() && ! IsRestrictedPeer(ident)) {
// not trusted
LogPrint(eLogWarning, "Transports: closing untrusted inbound connection from ", ident.ToBase64());
session->Done();
return;
}
=======
EmitEvent({{"type" , "transport.connected"}, {"ident", ident.ToBase64()}, {"inbound", "true"}});
>>>>>>> bda4170... add web socket ui
session->SendI2NPMessages ({ CreateDatabaseStoreMsg () }); // send DatabaseStore
std::unique_lock<std::mutex> l(m_PeersMutex);
m_Peers.insert (std::make_pair (ident, Peer{ 0, nullptr, { session }, i2p::util::GetSecondsSinceEpoch (), {} }));