3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-13 16:21:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

request id can be int, string or null

Browse source
This commit is contained in:
badaix 2017-01-13 00:29:28 +01:00
parent 310aefac6e
commit 0a879301c9
4 changed files with 113 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
server/json/jsonrpc.cpp
View file

@ -51,10 +51,16 @@ void JsonRequest::parse(const std::string& json)
}
if (json_.count("id") == 0)
throw JsonInvalidRequestException("id is missing", -1);
id = json_["id"].get<int>();
if (id < 0)
throw JsonInvalidRequestException("id must be a positive integer", id);
throw JsonInvalidRequestException("id is missing");
try
{
id = req_id(json_["id"]);
}
catch(const std::exception& e)
{
throw JsonInvalidRequestException(e.what());
}
if (json_.count("jsonrpc") == 0)
throw JsonInvalidRequestException("jsonrpc is missing", id);
@ -98,7 +104,7 @@ Json JsonRequest::getResponse(const Json& result)
{
Json response = {
{"jsonrpc", "2.0"},
{"id", id},
{"id", id.toJson()},
{"result", result}
};