g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-03-20 12:04:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Always emit source_info and reflector fields in JSON output

Browse source 
Several JSON message builders conditionally omit fields when their
values are empty or null:
 - DMRSlot, P25Control, NXDNControl: source_info omitted when the
   callsign/ID lookup returns an empty string
 - DStarControl: reflector omitted in RF start messages and when
   the reflector pointer is null in network start messages
 - YSFControl: reflector omitted in RF start messages

Downstream consumers (such as Display-Driver) that access these
fields via nlohmann::json const operator[] crash with an assertion
failure when the key is absent.

Always emit these fields with an empty string default so that the
JSON schema is consistent regardless of lookup results or message
source.
This commit is contained in:
Andy Taylor 2026-03-17 15:02:38 +00:00
parent 10680f51a5
commit 9b8a6c1e2c
5 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
DMRSlot.cpp
View file

@ -2519,8 +2519,7 @@ void CDMRSlot::writeJSON(nlohmann::json& json, const char* source, const char* a
json["destination_id"] = int(dstId);
json["destination_type"] = grp ? "group" : "individual";
if (!srcInfo.empty())
json["source_info"] = srcInfo;
json["source_info"] = srcInfo;
}
#endif

7
DStarControl.cpp
View file

@ -1499,8 +1499,9 @@ void CDStarControl::writeJSONRF(const char* action, const unsigned char* my1, co
json["source_ext"] = convertBuffer(my2, DSTAR_SHORT_CALLSIGN_LENGTH);
json["destination_cs"] = convertBuffer(your, DSTAR_LONG_CALLSIGN_LENGTH);
json["source"] = "rf";
json["action"] = action;
json["source"] = "rf";
json["action"] = action;
json["reflector"] = "";
WriteJSON("D-Star", json);
}
@ -1554,6 +1555,8 @@ void CDStarControl::writeJSONNet(const char* action, const unsigned char* my1, c
if (reflector != nullptr)
json["reflector"] = convertBuffer(reflector, DSTAR_LONG_CALLSIGN_LENGTH);
else
json["reflector"] = "";
WriteJSON("D-Star", json);
}

3
NXDNControl.cpp
View file

@ -1284,8 +1284,7 @@ void CNXDNControl::writeJSON(nlohmann::json& json, const char* source, const cha
json["destination_id"] = int(dstId);
json["destination_type"] = grp ? "group" : "individual";
if (!srcInfo.empty())
json["source_info"] = srcInfo;
json["source_info"] = srcInfo;
}
#endif

3
P25Control.cpp
View file

@ -1383,8 +1383,7 @@ void CP25Control::writeJSON(nlohmann::json& json, const char* source, const char
json["destination_id"] = int(dstId);
json["destination_type"] = grp ? "group" : "individual";
if (!srcInfo.empty())
json["source_info"] = srcInfo;
json["source_info"] = srcInfo;
}
#endif

7
YSFControl.cpp
View file

@ -1343,9 +1343,10 @@ void CYSFControl::writeJSONRF(nlohmann::json& json, const char* action, const un
json["source_cs"] = convertBuffer(source);
json["source"] = "rf";
json["action"] = action;
json["dg-id"] = int(dgid);
json["source"] = "rf";
json["action"] = action;
json["dg-id"] = int(dgid);
json["reflector"] = "";
}
void CYSFControl::writeJSONNet(nlohmann::json& json, const char* action)