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

Jump to bottom

Fix availability handler sending false on offer #510

Merged
merged 2 commits into from
Nov 7, 2023
Merged

Fix availability handler sending false on offer #510

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7dcc67
Don't ignore service requests after Offer, if service is set to ANY_S…
doschropa Aug 24, 2023
11478ad
Update routing_manager_impl.cpp
DiogoPedrozza Nov 7, 2023
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
84 changes: 53 additions & 31 deletions implementation/routing/src/routing_manager_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4066,28 +4066,39 @@ routing_manager_impl::get_requesters_unlocked(
std::set<client_t> its_requesters;

auto found_service = requested_services_.find(_service);
if (found_service != requested_services_.end()) {
auto found_instance = found_service->second.find(_instance);
if (found_instance != found_service->second.end()) {
for (const auto& its_major : found_instance->second) {
if (its_major.first == _major || _major == DEFAULT_MAJOR
|| its_major.first == ANY_MAJOR) {
for (const auto &its_minor : its_major.second) {
if (its_minor.first <= _minor
|| _minor == DEFAULT_MINOR
|| its_minor.first == ANY_MINOR) {
if (its_requesters.empty()) {
its_requesters = its_minor.second;
} else {
its_requesters.insert(its_minor.second.cbegin(),
its_minor.second.cend());
}
}
if (found_service == requested_services_.end()) {
found_service = requested_services_.find(ANY_SERVICE);
if (found_service == requested_services_.end()) {
return its_requesters;
}
}

auto found_instance = found_service->second.find(_instance);
if (found_instance == found_service->second.end()) {
found_instance = found_service->second.find(ANY_INSTANCE);
if (found_instance == found_service->second.end()) {
return its_requesters;
}
}

for (const auto& its_major : found_instance->second) {
if (its_major.first == _major || _major == DEFAULT_MAJOR
|| its_major.first == ANY_MAJOR) {
for (const auto &its_minor : its_major.second) {
if (its_minor.first <= _minor
|| _minor == DEFAULT_MINOR
|| its_minor.first == ANY_MINOR) {
if (its_requesters.empty()) {
its_requesters = its_minor.second;
} else {
its_requesters.insert(its_minor.second.cbegin(),
its_minor.second.cend());
}
}
}
}
}

return its_requesters;
}

Expand All @@ -4097,24 +4108,35 @@ routing_manager_impl::has_requester_unlocked(
major_version_t _major, minor_version_t _minor) {

auto found_service = requested_services_.find(_service);
if (found_service != requested_services_.end()) {
auto found_instance = found_service->second.find(_instance);
if (found_instance != found_service->second.end()) {
for (const auto& its_major : found_instance->second) {
if (its_major.first == _major || _major == DEFAULT_MAJOR
|| its_major.first == ANY_MAJOR) {
for (const auto &its_minor : its_major.second) {
if (its_minor.first <= _minor
|| _minor == DEFAULT_MINOR
|| its_minor.first == ANY_MINOR) {

return true;
}
}
if (found_service == requested_services_.end()) {
found_service = requested_services_.find(ANY_SERVICE);
if (found_service == requested_services_.end()) {
return false;
}
}

auto found_instance = found_service->second.find(_instance);
if (found_instance == found_service->second.end()) {
found_instance = found_service->second.find(ANY_INSTANCE);
if (found_instance == found_service->second.end()) {
return false;
}
}

for (const auto& its_major : found_instance->second) {
if (its_major.first == _major || _major == DEFAULT_MAJOR
|| its_major.first == ANY_MAJOR) {
for (const auto &its_minor : its_major.second) {
if (its_minor.first <= _minor
|| _minor == DEFAULT_MINOR
|| its_minor.first == ANY_MINOR) {

return true;
}
}
}
}

return false;
}

Expand Down
Loading