diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-08-16 09:08:52 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-08-16 09:08:52 -0700 |
| commit | 4f0fcc582eed69e4a45a94c4ef5a4d0e2e31a216 (patch) | |
| tree | df37c60c4afb113f3a4fa6efad1a6cb919543e10 /node/Node.cpp | |
| parent | aa59cfd5458241cecb96409b90ca38058b65b651 (diff) | |
| download | infinitytier-4f0fcc582eed69e4a45a94c4ef5a4d0e2e31a216.tar.gz infinitytier-4f0fcc582eed69e4a45a94c4ef5a4d0e2e31a216.zip | |
Refactor HttpClient a bit.
Diffstat (limited to 'node/Node.cpp')
| -rw-r--r-- | node/Node.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/node/Node.cpp b/node/Node.cpp index 5d7de540..75578446 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -250,6 +250,7 @@ struct _NodeImpl delete renv.sw; renv.sw = (Switch *)0; // order matters less from here down delete renv.mc; renv.mc = (Multicaster *)0; delete renv.antiRec; renv.antiRec = (AntiRecursion *)0; + delete renv.http; renv.http = (HttpClient *)0; delete renv.prng; renv.prng = (CMWC4096 *)0; delete renv.log; renv.log = (Logger *)0; // but stop logging last of all @@ -408,7 +409,7 @@ static void _CBztTraffic(const SharedPtr<Socket> &fromSock,void *arg,const InetA _r->sw->onRemotePacket(fromSock,from,data); } -static void _cbHandleGetRootTopology(void *arg,int code,const std::string &url,bool onDisk,const std::string &body) +static void _cbHandleGetRootTopology(void *arg,int code,const std::string &url,const std::string &body) { RuntimeEnvironment *_r = (RuntimeEnvironment *)arg; if (_r->shutdownInProgress) @@ -524,6 +525,7 @@ Node::ReasonForTermination Node::run() } Utils::lockDownFile(configAuthTokenPath.c_str(),false); + _r->http = new HttpClient(); _r->antiRec = new AntiRecursion(); _r->mc = new Multicaster(); _r->sw = new Switch(_r); @@ -757,7 +759,7 @@ Node::ReasonForTermination Node::run() if ((now - lastRootTopologyFetch) >= ZT_UPDATE_ROOT_TOPOLOGY_CHECK_INTERVAL) { lastRootTopologyFetch = now; - HttpClient::GET(ZT_DEFAULTS.rootTopologyUpdateURL,HttpClient::NO_HEADERS,60,&_cbHandleGetRootTopology,_r); + _r->http->GET(ZT_DEFAULTS.rootTopologyUpdateURL,HttpClient::NO_HEADERS,60,&_cbHandleGetRootTopology,_r); } // Sleep for loop interval or until something interesting happens. |