aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2016-05-25 21:26:46 -0400
committerCory Fields <cory-nospam-@coryfields.com>2016-09-08 12:24:07 -0400
commite81a602cf02edfb21c3ec097bd7cf71f189ed783 (patch)
tree4740757392d73e64450bfcdff898d3bc07bbe591 /src/net.h
parentf60b9059e4958245bda82e9656c52a31d5268ad9 (diff)
net: pass CClientUIInterface into CConnman
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/net.h b/src/net.h
index 852822d85b..a45e18da67 100644
--- a/src/net.h
+++ b/src/net.h
@@ -96,6 +96,8 @@ struct AddedNodeInfo
class CTransaction;
class CNodeStats;
+class CClientUIInterface;
+
class CConnman
{
public:
@@ -109,7 +111,7 @@ public:
CConnman();
~CConnman();
- bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, std::string& strNodeError);
+ bool Start(boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServicesIn, ServiceFlags nRelevantServicesIn, int nMaxConnectionsIn, int nMaxOutboundIn, int nBestHeightIn, CClientUIInterface* interfaceIn, std::string& strNodeError);
void Stop();
bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
bool OpenNetworkConnection(const CAddress& addrConnect, bool fCountFailure, CSemaphoreGrant *grantOutbound = NULL, const char *strDest = NULL, bool fOneShot = false, bool fFeeler = false);
@@ -293,12 +295,13 @@ private:
int nMaxConnections;
int nMaxOutbound;
std::atomic<int> nBestHeight;
+ CClientUIInterface* clientInterface;
};
extern std::unique_ptr<CConnman> g_connman;
void MapPort(bool fUseUPnP);
unsigned short GetListenPort();
bool BindListenPort(const CService &bindAddr, std::string& strError, bool fWhitelisted = false);
-bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnections, int nMaxOutbound, int nBestHeightIn, std::string& strNodeError);
+bool StartNode(CConnman& connman, boost::thread_group& threadGroup, CScheduler& scheduler, ServiceFlags nLocalServices, ServiceFlags nRelevantServices, int nMaxConnections, int nMaxOutbound, int nBestHeightIn, CClientUIInterface* interfaceIn, std::string& strNodeError);
bool StopNode(CConnman& connman);
size_t SocketSendData(CNode *pnode);