saret/rpc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #31 from open-amt-cloud-toolkit/fix_msg_cleanup

Browse Source 
fix: use message status instead, cleanup message fields.
This commit is contained in:
trleasher-intel
2021-02-23 09:27:01 -07:00
committed by GitHub
parent da9c26bc26 2984880b6e
commit 365ad90adc
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
activation.cpp
View File

@@ -236,7 +236,7 @@ bool act_create_request(std::string commands, std::string dns_suffix, std::strin
utility::string_t tmp = utility::conversions::convertstring(commands);
msg[U("method")] = web::json::value::string(tmp);
tmp = utility::conversions::convertstring("key");
tmp = utility::conversions::convertstring("");
msg[U("apiKey")] = web::json::value::string(tmp);
tmp = utility::conversions::convertstring(PROJECT_VER);
@@ -245,10 +245,10 @@ bool act_create_request(std::string commands, std::string dns_suffix, std::strin
tmp = utility::conversions::convertstring(PROTOCOL_VERSION);
msg[U("protocolVersion")] = web::json::value::string(tmp);
tmp = utility::conversions::convertstring("ok");
tmp = utility::conversions::convertstring("");
msg[U("status")] = web::json::value::string(tmp);
tmp = utility::conversions::convertstring("ok");
tmp = utility::conversions::convertstring("");
msg[U("message")] = web::json::value::string(tmp);
// get the activation payload
@@ -281,7 +281,7 @@ bool act_create_response(std::string payload, std::string& response)
utility::string_t tmp = utility::conversions::convertstring("response");
msg[U("method")] = web::json::value::string(tmp);
tmp = utility::conversions::convertstring("key");
tmp = utility::conversions::convertstring("");
msg[U("apiKey")] = web::json::value::string(tmp);
tmp = utility::conversions::convertstring(PROJECT_VER);
@@ -290,10 +290,10 @@ bool act_create_response(std::string payload, std::string& response)
tmp = utility::conversions::convertstring(PROTOCOL_VERSION);
msg[U("protocolVersion")] = web::json::value::string(tmp);
tmp = utility::conversions::convertstring("ok");
tmp = utility::conversions::convertstring("");
msg[U("status")] = web::json::value::string(tmp);
tmp = utility::conversions::convertstring("ok");
tmp = utility::conversions::convertstring("");
msg[U("message")] = web::json::value::string(tmp);
tmp = utility::conversions::convertstring(util_encode_base64(payload));

4
main.cpp
View File

@@ -249,7 +249,7 @@ int main(int argc, char* argv[])
// process any messages we can
// - if success, done
// - if error, get out
if (msgMethod.compare("success")==0)
if (msgStatus.compare("success")==0)
{
// cleanup
g_timeout_val = 0;
@@ -258,7 +258,7 @@ int main(int argc, char* argv[])
std::cout << std::endl << msgMessage << std::endl;
return;
}
else if (msgMethod.compare("error")==0)
else if (msgStatus.compare("failed")==0)
{
// cleanup
g_timeout_val = 0;