Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt for protobuf 30.0 API changes #650

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −6
Open

Adapt for protobuf 30.0 API changes #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Library/IPCClientPrivate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ namespace usbguard
std::string payload;
message.SerializeToString(&payload);
struct qb_ipc_request_header hdr;
hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(message.GetTypeName());
hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(std::string(message.GetTypeName()));
hdr.size = sizeof hdr + payload.size();
struct iovec iov[2];
iov[0].iov_base = &hdr;
Expand Down
2 changes: 1 addition & 1 deletion src/Library/IPCClientPrivate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace usbguard
template<class T>
void registerHandler(MessageHandler::HandlerType method)
{
const uint32_t type_number = IPC::messageTypeNameToNumber(T::default_instance().GetTypeName());
const uint32_t type_number = IPC::messageTypeNameToNumber(std::string(T::default_instance().GetTypeName()));
_handlers.emplace(type_number, MessageHandler::create<T>(*this, method));
}

Expand Down
6 changes: 3 additions & 3 deletions src/Library/IPCServerPrivate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ namespace usbguard
message->SerializeToString(&payload);
struct qb_ipc_response_header hdr;
struct iovec iov[2];
hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(message->GetTypeName());
hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(std::string(message->GetTypeName()));
hdr.size = sizeof hdr + payload.size();
hdr.error = 0;
iov[0].iov_base = &hdr;
Expand Down Expand Up @@ -555,15 +555,15 @@ namespace usbguard
std::string payload;
message->SerializeToString(&payload);
struct qb_ipc_response_header hdr = { };
hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(message->GetTypeName());
hdr.id = QB_IPC_MSG_USER_START + IPC::messageTypeNameToNumber(std::string(message->GetTypeName()));
hdr.size = sizeof hdr + payload.size();
hdr.error = 0;
struct iovec iov[2];
iov[0].iov_base = &hdr;
iov[0].iov_len = sizeof hdr;
iov[1].iov_base = (void*)payload.data();
iov[1].iov_len = payload.size();
qbIPCBroadcastData(iov, 2, messageTypeNameToAccessControlSection(message->GetTypeName()));
qbIPCBroadcastData(iov, 2, messageTypeNameToAccessControlSection(std::string(message->GetTypeName())));
iov[0].iov_base = nullptr;
iov[1].iov_base = nullptr;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Library/IPCServerPrivate.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ namespace usbguard
void registerHandler(MessageHandler::HandlerType method, IPCServer::AccessControl::Section section,
IPCServer::AccessControl::Privilege privilege)
{
const uint32_t type_number = IPC::messageTypeNameToNumber(T::default_instance().GetTypeName());
const uint32_t type_number = IPC::messageTypeNameToNumber(std::string(T::default_instance().GetTypeName()));
_handlers.emplace(type_number, MessageHandler::create<T>(*this, method, section, privilege));
}

Expand Down