This commit is contained in:
Adam Ierymenko 2015-04-15 14:44:30 -07:00
parent 8639538299
commit a0f8685453
4 changed files with 11 additions and 8 deletions

View file

@ -30,7 +30,10 @@
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include "service/One.hpp" #include <string>
#include <stdexcept>
#include "service/OneService.hpp"
using namespace ZeroTier; using namespace ZeroTier;

View file

@ -26,7 +26,7 @@
*/ */
#include "ControlPlane.hpp" #include "ControlPlane.hpp"
#include "One.hpp" #include "OneService.hpp"
#include "../version.h" #include "../version.h"
#include "../include/ZeroTierOne.h" #include "../include/ZeroTierOne.h"
@ -196,7 +196,7 @@ static void _jsonAppend(std::string &buf,const ZT1_Peer *peer)
buf.append(json); buf.append(json);
} }
ControlPlane::ControlPlane(One *svc,Node *n) : ControlPlane::ControlPlane(OneService *svc,Node *n) :
_svc(svc), _svc(svc),
_node(n) _node(n)
{ {

View file

@ -36,7 +36,7 @@
namespace ZeroTier { namespace ZeroTier {
class One; class OneService;
class Node; class Node;
struct InetAddress; struct InetAddress;
@ -46,7 +46,7 @@ struct InetAddress;
class ControlPlane class ControlPlane
{ {
public: public:
ControlPlane(One *svc,Node *n); ControlPlane(OneService *svc,Node *n);
~ControlPlane(); ~ControlPlane();
/** /**
@ -71,7 +71,7 @@ public:
std::string &responseContentType); std::string &responseContentType);
private: private:
One *const _svc; OneService *const _svc;
Node *const _node; Node *const _node;
std::set<std::string> _authTokens; std::set<std::string> _authTokens;
}; };

View file

@ -130,8 +130,8 @@ protected:
OneService() {} OneService() {}
private: private:
OneService(const One &one) {} OneService(const OneService &one) {}
inline One &operator=(const One &one) { return *this; } inline OneService &operator=(const OneService &one) { return *this; }
}; };
} // namespace ZeroTier } // namespace ZeroTier