diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-02-13 15:41:53 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-02-13 15:41:53 -0800 |
| commit | 0052877d2fb9d7779d4612b4ca5b49f46c52b101 (patch) | |
| tree | 4fdff409cca26267136eba438a0ff185ddcfe158 /service | |
| parent | 23bb44f2d6379b656a4166bdbf52c4b116b482e6 (diff) | |
| download | infinitytier-0052877d2fb9d7779d4612b4ca5b49f46c52b101.tar.gz infinitytier-0052877d2fb9d7779d4612b4ca5b49f46c52b101.zip | |
Add CLI shortcuts for adding federated roots.
Diffstat (limited to 'service')
| -rw-r--r-- | service/ControlPlane.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 6b6c724b..edc54bbd 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -138,7 +138,9 @@ static void _peerToJson(nlohmann::json &pj,const ZT_Peer *peer) static void _moonToJson(nlohmann::json &mj,const World &world) { - mj["id"] = world.id(); + char tmp[64]; + Utils::snprintf(tmp,sizeof(tmp),"%.16llx",world.id()); + mj["id"] = tmp; mj["timestamp"] = world.timestamp(); mj["signature"] = Utils::hex(world.signature().data,world.signature().size()); mj["updatesMustBeSignedBy"] = Utils::hex(world.updatesMustBeSignedBy().data,world.updatesMustBeSignedBy().size()); @@ -153,7 +155,7 @@ static void _moonToJson(nlohmann::json &mj,const World &world) ra.push_back(rj); } mj["roots"] = ra; - mj["active"] = true; + mj["waiting"] = false; } } // anonymous namespace @@ -369,7 +371,7 @@ unsigned int ControlPlane::handleRequest( try { nlohmann::json j(OSUtils::jsonParse(body)); if (j.is_object()) { - seed = OSUtils::jsonInt(j["seed"],0); + seed = Utils::hexStrToU64(OSUtils::jsonString(j["seed"],"0").c_str()); } } catch ( ... ) { // discard invalid JSON @@ -386,13 +388,14 @@ unsigned int ControlPlane::handleRequest( } if ((scode != 200)&&(seed != 0)) { - res["seed"] = seed; - res["id"] = id; + char tmp[64]; + Utils::snprintf(tmp,sizeof(tmp),"%.16llx",id); + res["id"] = tmp; res["roots"] = nlohmann::json::array(); res["timestamp"] = 0; res["signature"] = nlohmann::json(); res["updatesMustBeSignedBy"] = nlohmann::json(); - res["active"] = false; + res["waiting"] = true; _node->orbit(id,seed); } |