bump cereal (#29561)

old-commit-hash: e726505918bfbaa4ee75714bd6ea391d7fff7fb8
This commit is contained in:
Adeeb Shihadeh
2023-08-23 13:42:37 -07:00
committed by GitHub
parent 97e9d55588
commit 6b2ffe9490
5 changed files with 22 additions and 11 deletions
+6 -5
View File
@@ -16,19 +16,20 @@ Replay::Replay(QString route, QStringList allow, QStringList block, QStringList
auto event_struct = capnp::Schema::from<cereal::Event>().asStruct();
sockets_.resize(event_struct.getUnionFields().size());
for (const auto &it : services) {
uint16_t which = event_struct.getFieldByName(it.name).getProto().getDiscriminantValue();
auto name = it.second.name.c_str();
uint16_t which = event_struct.getFieldByName(name).getProto().getDiscriminantValue();
if ((which == cereal::Event::Which::UI_DEBUG || which == cereal::Event::Which::USER_FLAG) &&
!(flags & REPLAY_FLAG_ALL_SERVICES) &&
!allow.contains(it.name)) {
!allow.contains(name)) {
continue;
}
if ((allow.empty() || allow.contains(it.name)) && !block.contains(it.name)) {
sockets_[which] = it.name;
if ((allow.empty() || allow.contains(name)) && !block.contains(name)) {
sockets_[which] = name;
if (!allow.empty() || !block.empty()) {
allow_list.insert((cereal::Event::Which)which);
}
s.push_back(it.name);
s.push_back(name);
}
}